Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 18273)
+++ applications/editors/josm/i18n/po/ar.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-17 15:05+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-06 16:26+0000\n"
+"Last-Translator: metehyi <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,67 +17,67 @@
 "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: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
-msgstr "جاري إنشاء واجهة المستخجم الرسومية الرئيسية"
+msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "تجاهل URL سيئة التكوين: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -90,12 +90,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -105,27 +99,26 @@
 msgstr "التحذير"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "تجاهل عنوان  الملف  المشوه : \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -133,23 +126,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -157,5 +151,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -164,21 +158,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -187,5 +182,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -198,17 +193,9 @@
 msgstr "خطأ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "مجهول"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "معلومات حول"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "أعرض شاشة المعلومات حول."
@@ -216,37 +203,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "محرر جافا خريطة الطريق المفتوحة"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "الإصدار {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../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:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "إصدارجافا {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "صفحة الإنترنت"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "تقارير عن أخطاء"
@@ -256,5 +243,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -262,33 +249,29 @@
 msgstr "معلومات"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "نص للقراءة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "مراجعة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "المشاركة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "الرخصة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "إضافات"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "حول JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "لا يمكن العثور عن الملف"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -316,45 +299,44 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
 msgid "Continue"
-msgstr ""
+msgstr "تابع"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -362,5 +344,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -373,19 +355,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+msgstr "الرجاء إنتقاء الطبقة الهدف."
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+msgstr "إنتقاء الطبقة الهدف."
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+msgstr "إدمج"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -394,50 +376,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+msgstr "لا يوجد طبقات هدف"
+
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "أضف عقدة..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "أضف عقدة بواسطة خط الطول و خط العرض."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "حرّر : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "أدخل الأحداثيات للعقدة الجديدة."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "إستعمل الدرجات العشرية."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "القيم السلبية هي لنصف الكرة الغربية/الجنوبية"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -446,5 +428,5 @@
 msgstr "خط العرض"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -453,27 +435,27 @@
 msgstr "خط الطول"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../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:36
+#: ../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:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -483,5 +465,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -497,30 +479,28 @@
 msgstr "العدة: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../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:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -530,84 +510,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../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:32
+#: ../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:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "المعطيات"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "الطبقة"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "الخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "التناقض"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "نزّل"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "زوم الى {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "كبّر/صغّر الرؤية إلى {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "أعرض: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "لا يوجد شيء محدد للتكبير/للتصغير."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "لا  تناقضات للتكبير عليها"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -615,37 +595,37 @@
 msgstr "الملف : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../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:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "ادمج عدة طرق في طريق واحدة."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "غيّر الإتجاه ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "أعكس  ثم إدمج"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -653,5 +633,5 @@
 msgstr "لا يمكن ضمّ الطرقات في إتجاهاتها الحالية. هل تريد عكس إتجاهات بعضها ؟"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -659,41 +639,41 @@
 msgstr "لا يمكن تجميع الطرق (لا يمكن دمجها في سلسلة عقد واحدة)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "ادمج {0} طرقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "الرجاء إختر على الأقل طريقتين للدمج."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "نسخ"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "نسخ الكائنات  المختارة الى وسيط الصق"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "إنشاء حلقة"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "كوّن مستديرة من ثلاث عقد مختارة."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+msgstr "هذه العقد لا تشكل دائرة. جاري الإجهاض العملية."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -701,16 +681,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -722,5 +700,5 @@
 msgstr "أحذف"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "امحي الأغراض المختارة."
@@ -728,6 +706,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -741,114 +719,91 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../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:30
+#: ../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:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "نزّل من أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "نزّل معطيات خريطة من الخادم أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "نزّل"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "مُوافق"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
 #, java-format
 msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "نسخة مطابقة"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr ""
@@ -858,41 +813,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "أخرُج من التطبيق."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "صدّر إلى GPX ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "صدّر المعطيات إلى ملف GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "لا شيء للتصدير. إحصل على بعض المعطيات أولاً."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -931,6 +886,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -949,9 +904,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -969,7 +924,7 @@
 #, java-format
 msgid "Parameter ''{0}'' must not be null."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -977,36 +932,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+msgstr "خط الغرض الزمني"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../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:16
+msgstr "معلومات حول العنصر"
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../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:29
+#: ../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:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "ضمّ العقدة و الخط"
@@ -1016,168 +971,186 @@
 msgstr "لا إختصار"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+msgstr "أدمج الطبقة الحالية في طبقة أخرى"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "إدمج العقد"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+msgstr "ادمج العقد إلى العقدة الأعتق."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "الرجاء إختيار على الأقل عقدتين للدمج."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "إجهاض..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "إدمج {0} عقد"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../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:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../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:33
+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:53
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "إلى أعلى"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "حرّك الأغراض {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "إلى أسفل"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "إلى اليسار"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "إلى اليمين"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "حرذك {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "حرّك الأغراض {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "غير قادر على تحريك الأغراض إلى خارج الدنيا"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "جديد"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "أنشئ خريطة جديدة."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "إفتح..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "إفتح ملف."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+msgstr "جاري فتح الملفات"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+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:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "إفتح URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "أدخل الــ URL للتنزيل:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "موقع التنزيل"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "URL التنزيل"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+msgstr "إبدء في تنزيل المعطيات"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
-msgstr ""
+msgstr "أغلق الحوار و الغي التنزيل"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "جاري تحميل المعطيات"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr ""
@@ -1187,18 +1160,18 @@
 msgstr "حرّك العقد حيث تكون الزوايا 90 أو 270 درجة"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1207,9 +1180,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1218,36 +1191,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+msgstr "الاستعمال"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "إسقاط عمودي"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "ألصِق"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
+#: ../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 "Paste Tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1256,5 +1230,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1263,59 +1237,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "التفضيلات..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "التفضيلات"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "و غير إسم الملف"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "أعكس إتجاه الطرقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "أعكس إتجاه كل الطرقات المختارة."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "الرجاء إختيار على الأقل طريق واحدة."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "أعكس إتجاه الطرقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1323,10 +1297,10 @@
 msgstr "إحفَظ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "إحفظ المعطيات الحالية."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1375,21 +1349,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "إحفظ كــ ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "إحفظ المعطيات الحالية في ملف جديد."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "إختر الكلّ"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1397,28 +1371,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "أعرض تقرير عن الحالة"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "المساعدة: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "تقرير عن الحالة"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1427,18 +1401,18 @@
 msgstr "اغلق"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1450,5 +1424,5 @@
 msgstr[5] "إنّ العقد المختارة ليست موجودة في وسط أي طريق."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1460,9 +1434,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "إنّ العقد المختارة لا تتقاسم نفس الطريق."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1470,10 +1444,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1498,70 +1472,70 @@
 msgstr "أقسم الطريق {0} إلى {1} قطع"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "أرسم خطوط بين نقاط جهاز نظام تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "إختر أي من :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* عقدة واحدة مستعملة من أكثر من طريق واحدة، أو"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 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:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 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:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 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:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1571,9 +1545,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1581,80 +1555,80 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "إلغاء التصرف الأخير."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "إلغاء إختيار الكلّ"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "إلغاء إختيار كلّ الأغراض."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+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:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr ""
@@ -1666,8 +1640,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1676,5 +1650,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1682,29 +1656,29 @@
 msgstr "لا يوجد تغييرات للتحميل."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1718,11 +1692,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1733,5 +1707,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1741,23 +1715,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "علاقة متناقضة"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1768,28 +1741,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1798,17 +1762,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "غيّر غرض {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1827,11 +1805,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "كبّر الرؤية"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "صغّر الرؤية"
@@ -1911,21 +1889,17 @@
 msgstr "تقدّم بطيء"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "تنزيل معطيات جهاز نظام تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "تمّ تنزيل معطيات جهاز نظام تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "المعطيات الخام لجهاز نظام تحديد المواقع العالمي"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "جاري تحميل المعطيات"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1933,27 +1907,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "معطيات OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../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:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "أخطاء عند التنزيل"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "إسم المستخدم."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1965,7 +1950,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "أخطاء عند التنزيل"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "أخطاء عند التنزيل"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1987,5 +1987,5 @@
 msgstr "النمط: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2013,38 +2013,38 @@
 msgstr "مُنتقى"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 msgid "Add node"
 msgstr "أضافة عقدة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "انشئ عقدة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "إختر العقدة الموجودة تحت المزلاق."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2053,14 +2053,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "إبدء طريق جديدة من العقدة الأخيرة."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "تابع طريق من العقدة الأخيرة."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "إنهي الرسم."
@@ -2080,5 +2080,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2089,5 +2089,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -2147,10 +2147,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2160,4 +2160,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "تكبير/تصغير"
@@ -2175,5 +2176,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "بحث..."
@@ -2272,42 +2272,49 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>العقد:</b>... - الغرض ذات عدد العقد المحدد"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>مغيير</b> - كلّ الأغراض المغييرة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>المختارة</b> - كلّ الأغراض المختارة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>غير المكتملة</b> - كلّ الأغراض غير المكتملة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>غير المسمات</b> - كلّ الأغراض غير المسمات"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "إستعمل <b>|</b> أو <b>أو</b> للدمج بالأو المنطقي"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2317,51 +2324,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "إبحث"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "إبدء البحث"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "لم أجد شيء مطابق لِــ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "وجدتُ {0} مطابقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr ""
@@ -2389,26 +2396,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2417,5 +2435,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2510,4 +2528,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "مُوافق"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2525,8 +2559,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "غيّر غرض {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2608,5 +2642,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2642,4 +2676,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2670,29 +2715,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "علاقة متناقضة"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "أمحي من العلاقة"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr ""
@@ -2700,6 +2722,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2708,5 +2730,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2890,15 +2912,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "القيمة الغيابية هي ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "ملف إعدادات غير صحيح التكوين في الأسطر {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2907,5 +2944,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2914,5 +2951,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2921,5 +2958,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2928,5 +2965,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2934,5 +2971,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2941,5 +2978,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2948,5 +2985,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2955,5 +2992,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2962,19 +2999,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "التفضيلات المخزنة على {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "لم أتمكن من تحميل التفضيلات. السبب هو : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "لم أتمكن من تحميل التفضيلات من الخادم."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -2983,5 +3043,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "مجهول"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3003,20 +3083,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "ج."
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "ش."
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "غ."
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "ش."
@@ -3027,4 +3107,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3092,14 +3186,14 @@
 msgstr "تحذير: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3107,5 +3201,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3132,6 +3226,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3191,113 +3285,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "الطريق ''{0}'' المتعددة الأضلاع هي غير مغلقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "أمحي العضو ''{0}'' في العلاقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "للطريق ''{0}'' أقل من نقطتين."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+msgid "More than one \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+msgid "More than one \"via\" found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-msgid "More than one \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
-msgid "More than one \"via\" found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "دور غير معروف ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "نوع عضو غير معروف لِــ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "لم أجد طريق \"من\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "لم أجد طريق \"إلى\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
-#, java-format
-msgid "No useful role ''{0}'' for Way ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
-#, java-format
-msgid "Non-Way ''{0}'' in multipolygon."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
-#, java-format
-msgid "No outer way for multipolygon ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "الطريق الداخلية ''{0}''موجودة في الخارج."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
+#, java-format
+msgid "No useful role ''{0}'' for Way ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#, java-format
+msgid "Non-Way ''{0}'' in multipolygon."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
+#, java-format
+msgid "No outer way for multipolygon ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3313,11 +3407,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "النص"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3333,5 +3426,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3346,5 +3438,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3381,5 +3472,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "الخلفية"
@@ -3408,12 +3499,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "حزام لامبيرت (فرنسا)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "حزام لامبيرت (فرنسا)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3449,10 +3538,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3481,5 +3570,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "خط سكة حديد"
@@ -3496,4 +3585,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3513,33 +3604,33 @@
 msgstr[1] "{0} أعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3547,16 +3638,16 @@
 msgstr "التناقض"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "مضيف غير معروف"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3569,4 +3660,8 @@
 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/MainApplet.java:38
@@ -3630,74 +3725,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "إسم المستخدم"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "كلمة‌المرور"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "الإستعمال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "الخيارات"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "أعرض هذه المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "عيّن اللغة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3706,9 +3801,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "أمثال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3716,25 +3811,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3747,11 +3842,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3776,6 +3871,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3876,25 +3971,21 @@
 msgstr "(لا يوجد أي غرض)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "الطبقة ليست في اللائحة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "لم يُعثر على الملف"
+#: ../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
@@ -3915,5 +4006,5 @@
 msgstr "غير مفعّل : لا تطبق هذه المواصفة على الأغراض المختارة"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3942,28 +4033,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "غيّر غرض {0}"
-msgstr[1] "غيّر {0} غرضين"
-msgstr[2] "غيّر {0} أغراض"
-msgstr[3] "غيّر {0} غرض"
-msgstr[4] "غيّر {0} أغراض"
-msgstr[5] "غيّر {0} غرض"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "امحي الأغراض المختارة."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "تم حذفه"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "العلاقة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -3975,5 +4059,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4022,5 +4106,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4037,5 +4121,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4235,8 +4319,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4543,6 +4627,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4556,6 +4640,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4613,36 +4697,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4654,5 +4738,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "الكلّ"
@@ -4742,4 +4826,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4754,4 +4840,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4765,49 +4852,82 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4844,6 +4964,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4930,10 +5050,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5000,5 +5117,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5043,4 +5161,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5066,6 +5185,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5074,22 +5193,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "قيمة فارغة ستمحي المفتاح."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<مختلف>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "غيّر القيم ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5098,69 +5217,73 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "الرجاء إختيار مفتاح"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "الرجاء إختيار قيمة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "خصائص/عضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "خصائص الأغراض المختارة."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "عضو من"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "أضف صفة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "حرّر الخصائص"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit the value of the selected key for all objects"
 msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "الخصائص: {0} / العضويات: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "الخصائص/ العضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "غيّر العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "أمحي من العلاقة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "أمحي الخصائص"
@@ -5168,40 +5291,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "العلاقات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "إفتح لائحة بكل العلاقات."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "العلاقات: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "إفتح محرر نص للعلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "أمحي العلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "أنشئ علاقة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "أمحي العلاقة المحددة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "إختر أي من :"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "أمحي العلاقة المحددة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "نزّل الأعضاء"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5228,5 +5371,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5238,14 +5381,14 @@
 msgstr "الخيار: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 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:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "أنقر لتكبير/تصغير محتويات اللوحة"
@@ -5327,5 +5470,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5355,23 +5499,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5380,14 +5524,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5397,9 +5541,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5409,15 +5553,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5425,5 +5569,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5431,20 +5575,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5453,66 +5597,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5521,9 +5665,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5532,41 +5676,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "نزّل الأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5576,17 +5720,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5597,13 +5741,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5617,14 +5761,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5674,57 +5818,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "إشارات مرجعية"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "الرجاء إدخال الأحداثيات المرغوبة أولاً."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "أنشئ مساحات"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "الرجاء إدخال إسم للموقع."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "إختر أولاً إشارة مرجعية"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "خ. العرض الأدنى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "خ. الطول الأدنى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "خ. العرض الأقصى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "خ. الطول الأقصى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5732,356 +5907,134 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "العلبة المحاطة"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "مصادر المعطيات و نوعيتها"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "معطيات OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+msgid "Select to download OSM data in the selected download area."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "المعطيات الخام لجهاز نظام تحديد المواقع العالمي"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+msgid "Select to download GPS traces in the selected download area."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "نزّل كطبقة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "نزّل المساحة"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "نزّل"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "أمحي الطبقة المختارة."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "المساحة المطلوبة ضخمة جداً، إحتمال أن ترفض من قبل الخادم"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "هذه المساحة ممكن تنزيلها، القياس مقبول من الخادم"
 
-#. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "الرجاء إدخال مصطلحات البحث"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "غير قادر على قراءة نتائج بحث عن الإسم من الخادم"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "أغلق الحوار و الغي التنزيل"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "الرجاء إختيار أربعة عقد على الأقل."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
 msgid "Enter a place name to search for:"
 msgstr "أدخل إسم المكان للبحث عنه:"
 
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "الأماكن"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "النوع"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "قرب"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "تكبير/تصغير"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "خريطة زالقة"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "نسبة التكبير/التصغير"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "س من"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "إلى"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "ي من"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "أرقام البلاطة"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "أدخل إسم المكان للبحث عنه:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "بحث..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+msgid "Click to start searching for places"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6439,4 +6392,6 @@
 #. 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" />
@@ -6817,6 +6772,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6882,11 +6838,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6896,6 +6852,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6905,79 +6861,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "الإسم"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "النوع"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "قرب"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "خريطة زالقة"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "نسبة التكبير/التصغير"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "س من"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "إلى"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "ي من"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "أرقام البلاطة"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "المستخدِم"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7058,4 +7281,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7347,9 +7571,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "الأغراض اللتي يجب تغييرها:"
+msgstr[1] "الأغراض اللتي يجب تغييرها:"
+msgstr[2] "الأغراض اللتي يجب تغييرها:"
+msgstr[3] "الأغراض اللتي يجب تغييرها:"
+msgstr[4] "الأغراض اللتي يجب تغييرها:"
+msgstr[5] "الأغراض اللتي يجب تغييرها:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7445,5 +7673,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7473,59 +7710,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "الصول لِــ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "إقرءGPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "لا توقيت للنقطة {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
-msgid "No images with readable timestamps found."
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
 #, java-format
 msgid "Reading {0}..."
 msgstr "جاري قراءة {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
+msgid "No images with readable timestamps found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "الإنحراف الحالي: {0}ث"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "إختلاف في التوقيت الجغرافي: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7537,51 +7774,51 @@
 msgstr[5] "صور"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} من ضمن المسلك."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "صور  (*.jpg)JPEG"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "الصورة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7589,30 +7826,30 @@
 msgstr "نقطة gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "إستعمل الإعدادات العامة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "حدد خيارات رسم الخطوط"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7620,5 +7857,5 @@
 msgstr "خصّص اللون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7627,5 +7864,5 @@
 msgstr "الغيابي"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7634,43 +7871,43 @@
 msgstr "إختر لون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "إستورد صوت مسجل"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "ملفات صوتيت (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "العلامات الصوتية من {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "إستورد صور"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "الإسم: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "الوصف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7680,28 +7917,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "الطول: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7710,5 +7947,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7717,10 +7954,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7730,11 +7967,11 @@
 "مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7744,29 +7981,29 @@
 msgstr "محوّل من: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "نزّل كلّ شيئ بين:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} أمتار"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "المساحة القصوى للمطلب:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7775,13 +8012,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7789,5 +8022,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7795,23 +8028,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "طبقة المعطيات {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "خارج عن المنطقة المنزلة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7820,39 +8053,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "أغلق الحوار و الغي التنزيل"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} ممحي.)"
+msgstr[1] " ({0} ممحي.)"
+msgstr[2] " ({0} ممحي.)"
+msgstr[3] " ({0} ممحي.)"
+msgstr[4] " ({0} ممحي.)"
+msgstr[5] " ({0} ممحي.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} يتألف من:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} ممحي.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8027,6 +8289,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8041,6 +8301,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8210,5 +8468,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8535,20 +8793,19 @@
 msgstr "اللغة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "تمكين الغيابيات المبيتة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8563,6 +8820,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "حدّث"
@@ -8714,68 +8970,102 @@
 msgstr "الإختصار"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "حرّك العقد المحددة إلى الحلقة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "أضف تعليق"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "إنعاش لائحة الخيارات."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "أمحي العلاقة المحددة"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8955,5 +9245,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "مزيد من المعلومات عن هذه الميزة"
@@ -9022,16 +9312,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "المجموعة المسبقة التعريف ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "المجموعة المسبقة التعريف ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9039,5 +9329,5 @@
 msgstr "جاري الإتصال بلخادم أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9146,5 +9436,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -9370,5 +9660,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9395,5 +9685,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9401,5 +9691,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9412,5 +9702,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9421,50 +9711,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "الإسم أو كلمة المرور خطأ"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "تحذير: يتم نقل كلمة المرور بدون تعتيم"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "إحفظ المستخدم و كلمة المرور (غير معتمة)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "أدخل كلمة المرور"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "دخول"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "URL الخادم الأساسي"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "كلمة المرور أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9561,5 +9851,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9568,38 +9858,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9607,19 +9897,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "غرض غير مسموح به معروف بــ id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9628,7 +9918,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9638,25 +9932,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9664,5 +9958,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9671,5 +9965,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9677,5 +9971,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9684,13 +9978,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "حضّر المعطيات أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9701,14 +9995,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "نزّل من أو.أس.أم ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9819,15 +10112,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9837,29 +10130,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9871,10 +10172,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9884,47 +10185,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "حدّث"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9932,9 +10244,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9942,19 +10254,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9962,22 +10274,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "لا يوجدأي وصف"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9986,18 +10298,18 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10007,9 +10319,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10021,9 +10333,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10045,19 +10357,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "مجهول"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: الإصدار {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10115,5 +10427,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10122,5 +10434,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10129,5 +10441,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10137,5 +10449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10145,10 +10457,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10157,5 +10469,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10164,16 +10476,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10183,5 +10495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10190,5 +10502,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10197,5 +10509,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10204,10 +10516,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10216,10 +10528,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10230,5 +10542,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10238,5 +10550,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10247,5 +10559,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10344,11 +10656,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10491,5 +10796,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -10505,10 +10811,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10516,103 +10822,103 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10662,46 +10968,47 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
+msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -10953,5 +11260,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -10964,10 +11271,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11015,13 +11322,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11030,13 +11337,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11144,7 +11451,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "أعرض الإحداثيات كــ"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11162,5 +11468,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11201,13 +11507,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11338,22 +11644,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11361,5 +11667,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11373,9 +11679,9 @@
 msgstr "أطلب كعكة إنترنت جديدة (إنتهاء مهلة الجلسة)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11398,5 +11704,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11418,5 +11724,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr ""
@@ -11445,5 +11751,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11452,18 +11758,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "خطء في صيغة المعطيات"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11558,5 +11864,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "لم يتم تحميل أي معطيات."
@@ -11962,7 +12268,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "الماء"
@@ -12163,32 +12469,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr ""
@@ -12277,24 +12583,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12438,4 +12744,9 @@
 msgstr ""
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "الطبقات"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12481,30 +12792,30 @@
 msgstr "الأفعال المسموح بها"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "هل تريد السماح بذلك ؟"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
+msgid "Confirm Remote Control action"
+msgstr ""
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-msgid "Confirm Remote Control action"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12523,7 +12834,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12532,4 +12841,5 @@
 #: ../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 ""
@@ -12551,25 +12861,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12599,92 +12909,85 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "تكبير/تصغير"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+msgid "Show Tile Info"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "نسبة التكبير/التصغير"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
 msgstr ""
 
@@ -12698,5 +13001,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12858,5 +13161,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "إسم الشارع"
@@ -12900,29 +13203,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -12930,33 +13233,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "ادخل القيم لكل التناقضات."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "حلل التناقضات"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13161,8 +13464,4 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr ""
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13207,23 +13506,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
-msgid "Unconnected coastline"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
+msgid "Unconnceted coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "أعكس  ثم إدمج"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13246,18 +13544,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13498,4 +13796,8 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13710,7 +14012,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr ""
@@ -13724,5 +14026,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr ""
@@ -13732,25 +14034,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr ""
@@ -13842,21 +14144,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14089,9 +14396,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
@@ -14537,6 +14844,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr ""
@@ -15098,5 +15405,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15108,5 +15415,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "غابة/حرش"
@@ -15394,7 +15701,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr ""
@@ -15543,8 +15850,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr ""
@@ -15671,31 +15978,4 @@
 msgstr ""
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "النوع"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15816,5 +16096,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr ""
@@ -15849,5 +16129,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr ""
@@ -15882,5 +16162,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr ""
@@ -16270,12 +16550,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "شركة الإدارة"
@@ -16488,6 +16768,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -16914,5 +17194,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr ""
@@ -17445,25 +17725,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
@@ -17529,24 +17809,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17559,24 +17839,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17589,24 +17869,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17639,6 +17919,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "الرقم المرجعي"
@@ -17654,5 +17934,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "تحت الأرض"
@@ -17666,5 +17946,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "رسم دخول/إجرة"
@@ -17900,5 +18180,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "ملجأ"
@@ -18366,5 +18646,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "ركب الدراجة"
@@ -18379,5 +18659,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "تزلّج"
@@ -18531,16 +18811,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "موقع أثري"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "حرّر موقع أثري"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "نصب تذكاري"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "نصب تذكاري"
@@ -18548,55 +18841,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "ضريح/مزار"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "حرّر مزار/ضريح"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "وقت الفراغ"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "حرّر حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "ملعب"
@@ -18604,35 +18897,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "حرّر ملعب"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "صيد السمك"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "حرّر صيد السمك"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "المرافق الرياضية"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "حرّر مدرج ألعاب رياضية"
@@ -18646,6 +18939,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "إختر الرياضة :"
@@ -19037,30 +19330,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "الرياضة"
@@ -19070,227 +19363,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "مركز/نادي  رياضي"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "حرّر مركز/نادي رياضي"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "رياضة"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "متعدد"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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"
@@ -19327,203 +19673,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "سلاح الرامي"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "حرّر سلاح الرامي"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "تسلق"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "حرّر تسلق"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "غدف"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "حرّر غدف"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "حرّر ركب الدراجة"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "سباق الكلاب"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "حرّر سباق الكلاب"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "فروسي"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "حرّر فروسي"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "سباق الخيل"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "حرّر سباق الخيل"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "رياضة بدنية"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "حرّر رياضة بدنية"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "رياضة المحركات"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "حرّر رياضة المحركات"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "تزحلق"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "حرّر تزحلق"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "سباحة"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "حرّر سباحة"
@@ -19531,56 +19877,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "حرّر تزلّج"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "نزولاً"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "شمالي"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "الصعوبة"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "مبتدئ"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "سهل"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "خبير"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "رماية"
@@ -19588,182 +19934,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "حرّر رماية"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "رياضة (كرة)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "كرة القدم"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "حرّر كرة القدم"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "تنس"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "مباني"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "مبنى"
@@ -19771,5 +20117,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -19777,10 +20123,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -19788,10 +20134,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "سفارة"
@@ -19799,10 +20145,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "محكمة"
@@ -19811,10 +20157,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "سجن"
@@ -19823,10 +20169,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "شرطة"
@@ -19836,10 +20182,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -19848,10 +20194,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "حرّر فوج إطفاء"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -19859,5 +20205,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
@@ -19865,15 +20211,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "مدرسة"
@@ -19881,10 +20227,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "جامعة"
@@ -19892,10 +20238,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "كلّية"
@@ -19903,5 +20249,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "حرّر كلّية"
@@ -19909,5 +20255,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "سينما"
@@ -19916,10 +20262,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "مكتبة"
@@ -19928,9 +20274,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -19938,10 +20284,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "مسرح"
@@ -19950,10 +20296,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "معبد"
@@ -19963,5 +20309,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -19970,6 +20316,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "الديانة"
@@ -19978,66 +20324,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "بهائي"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "بوذي"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "نصراني"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "هندوس"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "يهودي"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "مسلم"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "سيخ"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "روحاني"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -20046,81 +20392,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "معمداني"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "كثليك"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "إنجيلي"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "لوثري"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "منهجي"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "أرثدكس"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "بروتستاني"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "شيعي"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "سنّي"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "عناوين"
@@ -20129,5 +20475,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "حرّر معلومات عنوان"
@@ -20135,5 +20481,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "رقم المنزل"
@@ -20141,20 +20487,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "تسمية المنزل"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "رمز البلد"
@@ -20163,5 +20509,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "حرّر إستيفاء العنوان"
@@ -20169,61 +20515,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "مخطط الترقيم"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "مفرد"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "مثنى"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "المصانع"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "برج"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20231,25 +20577,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "منارة"
@@ -20257,10 +20603,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -20268,10 +20614,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -20280,37 +20626,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "غاز"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -20320,10 +20666,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "ونش"
@@ -20331,10 +20677,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "حرّر ونش"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "عمود إضائة"
@@ -20342,10 +20688,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -20353,10 +20699,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -20364,5 +20710,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
@@ -20370,5 +20716,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -20378,35 +20724,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "فحم"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -20415,10 +20761,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -20427,5 +20773,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -20433,10 +20779,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -20447,23 +20793,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -20472,75 +20818,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "التوتر"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "خدمات/نافعات"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "مراحيض"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "الملاحظة"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "هاتف"
@@ -20549,5 +20895,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
@@ -20555,5 +20901,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "عملات معدنية"
@@ -20561,5 +20907,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "الملاحظات"
@@ -20567,5 +20913,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20573,5 +20919,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr ""
@@ -20579,15 +20925,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -20596,5 +20942,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -20602,35 +20948,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "علب (معدنية)"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "ملابس"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr ""
@@ -20639,31 +20985,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20734,40 +21080,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "خضار"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "ألماني"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -20776,30 +21121,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "منخفض"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "مخبئ"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "نافورة"
@@ -20808,10 +21153,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -20820,10 +21165,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -20831,33 +21176,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr ""
@@ -20865,9 +21210,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "كشك"
@@ -20875,27 +21220,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "حرّر كشك"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -20903,5 +21248,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr ""
@@ -20909,88 +21254,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "قسائم"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "مانع الحمل"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "جزار"
@@ -20998,9 +21343,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "حرّر جزار"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "خباز"
@@ -21008,9 +21353,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "حرّر خباز"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -21018,18 +21363,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "حرّر بائع الزهور"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "مأكولات عضوية"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "حرّر مبيع مأكولات عضوية"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21037,54 +21382,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "مشروبات"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "حاسوب"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "حرّر مبيع قطع حاسوب"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "إلكترونيات"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "حرّر إلكترونيات"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "حرّر مبيع Hifi"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr ""
@@ -21092,9 +21437,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "خردوات/أدوات منزلية"
@@ -21102,9 +21447,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "حرّر مخزن خردوات/أدوات منزلية"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -21112,54 +21457,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "قرطاسية"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "حلاق"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "حرّر حلاق"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "أحذية"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "حرّر أحذية"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "مرئيّات"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "حرّر مبيع مرئيّات"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "تنظيف جاف"
@@ -21167,9 +21512,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "حرّر تنظيف جاف"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "مصبغة/غسيل"
@@ -21177,9 +21522,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "حرّر مصبغة/غسيل"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "نشاطات في الخلاء"
@@ -21187,28 +21532,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "حرّر متجر نشاطات في الخلاء"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "حرّر نظاراتي"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "مصرف"
@@ -21216,14 +21561,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -21231,5 +21576,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -21237,15 +21582,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "أطباء"
@@ -21253,18 +21598,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -21272,5 +21617,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -21278,9 +21623,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "مستشفى"
@@ -21288,10 +21633,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -21300,5 +21645,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -21307,20 +21652,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -21328,5 +21673,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "بيطري"
@@ -21335,59 +21680,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "الأماكن"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "قارة"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "وطن"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "حرّر وطن"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "دولة/ولاية"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr ""
@@ -21395,15 +21745,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "مدينة"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "بلدة"
@@ -21411,10 +21761,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "ضاحية"
@@ -21422,25 +21772,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "قرية"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
@@ -21448,5 +21798,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "محلة"
@@ -21454,10 +21804,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "جزيرة"
@@ -21465,10 +21815,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21476,5 +21826,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21482,5 +21832,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -21488,10 +21838,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "حرّر مدخل كهف"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "قمّة"
@@ -21499,10 +21849,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "حرّر قمّة"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "جليد"
@@ -21510,10 +21860,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "حرّر جليد"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "بركان"
@@ -21521,70 +21871,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "حرّر بركان"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "الحدود"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "دولية"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "مدنية"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "محمية وطنية (بيئية)"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "شجرة"
@@ -21593,15 +21943,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "حرّر شجرة"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "حرج"
@@ -21610,5 +21960,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "حرّر حرج"
@@ -21616,17 +21966,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "صنوبري الثمر"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "مختلط"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "غابة"
@@ -21635,14 +21985,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "حرّر غابة"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
@@ -21650,25 +22000,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "حصاة"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "حرّر حصاة"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "أشجار منخفضة"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "حرّر أشجار منخفضة"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr ""
@@ -21676,10 +22026,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "هوّة"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr ""
@@ -21687,5 +22037,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "حرّر أرض بور"
@@ -21693,5 +22043,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -21700,45 +22050,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "مرج"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -21746,25 +22096,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "حديقة"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "عشب"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21772,10 +22122,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "شائع"
@@ -21783,20 +22133,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "متنزه"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -21804,5 +22154,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -21810,15 +22160,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -21826,9 +22176,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -21836,39 +22186,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -21876,15 +22226,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "عسكري"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -21892,55 +22242,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -21950,5 +22300,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -21957,10 +22307,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "الفلق الخارجي"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -21968,5 +22318,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -21975,5 +22325,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -21981,34 +22331,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -22017,15 +22367,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "إلى الطريق"
@@ -22033,5 +22383,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "الطريق"
@@ -22040,5 +22390,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -22046,5 +22396,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "نوع الطريق"
@@ -22116,5 +22466,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22123,17 +22473,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22186,5 +22536,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22193,13 +22543,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr ""
@@ -22213,10 +22563,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -22224,31 +22574,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "الشبكة"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -22257,30 +22607,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
@@ -22718,11 +23068,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "مهجور"
@@ -24746,5 +25096,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25416,4 +25766,12 @@
 #.
 #. <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"/>
@@ -25438,5 +25796,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "تاريخي"
@@ -25450,5 +25808,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "كسارة / مقلع حجارة"
@@ -25462,5 +25820,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr ""
@@ -25482,5 +25840,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "حوض"
@@ -25494,5 +25852,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "غابة"
@@ -25506,5 +25864,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "فناء مزرعة"
@@ -25527,5 +25885,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "بيع بلمفرق"
@@ -25539,5 +25897,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "صناعي"
@@ -25551,5 +25909,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25563,5 +25921,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "حقل خضار"
@@ -25575,5 +25933,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25630,7 +25988,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "عسكري"
@@ -25644,5 +26002,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "مقبرة/جبانة"
@@ -25655,5 +26013,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "قمّة"
@@ -25668,5 +26026,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "نهر الجليد"
@@ -25680,5 +26038,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "بركان"
@@ -25733,8 +26091,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "طبيعي"
@@ -25748,5 +26106,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "أشجار منخفضة"
@@ -25760,5 +26118,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "أرض بور"
@@ -25772,8 +26130,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "غابة/حرش"
+msgstr ""
 
 #. color water
@@ -25785,5 +26142,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "طين"
@@ -25797,5 +26154,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "شاطئ"
@@ -25873,8 +26230,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "طريق"
@@ -25922,7 +26279,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "الحدود"
@@ -26072,11 +26429,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "المكان"
@@ -26124,6 +26481,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "العنوان"
@@ -26431,18 +26788,36 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "خطء عند تحميل الصفحة {0}"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "إفتح طبقة  أولاً ( جي بي إكس، أو أس أم ، خابية)"
+#~ msgid "File could not be found."
+#~ msgstr "لا يمكن العثور عن الملف"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "علاقة متناقضة"
+
+#~ msgid "File not found"
+#~ msgstr "لم يُعثر على الملف"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "الرجاء إدخال الأحداثيات المرغوبة أولاً."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "إختر أولاً إشارة مرجعية"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "الرجاء إدخال مصطلحات البحث"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "غير قادر على قراءة نتائج بحث عن الإسم من الخادم"
+
+#~ msgid "name"
+#~ msgstr "الإسم"
+
+#~ msgid "zoom"
+#~ msgstr "تكبير/تصغير"
 
 #~ msgid "Unknown version"
 #~ msgstr "نسخة مجهولة"
-
-#~ msgid "Aborting..."
-#~ msgstr "إجهاض..."
 
 #~ msgid "false"
@@ -26524,6 +26899,6 @@
 #~ msgstr "المؤلفون: {0}"
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "إنعاش لائحة الخيارات."
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''"
 
 #~ msgid "Occupied By"
@@ -26620,4 +26995,7 @@
 #~ msgstr "إيحاء: بعض التغييرات أتت نتيجةً لتحميل معطيات جديدة إلى الخادم."
 
+#~ msgid "Error while loading page {0}"
+#~ msgstr "خطء عند تحميل الصفحة {0}"
+
 #~ msgid "Oberpfalz Geofabrik.de"
 #~ msgstr "Oberpfalz Geofabrik.de"
@@ -26637,4 +27015,7 @@
 #~ msgid "Show Author Panel"
 #~ msgstr "أعرض لوحة المؤلف"
+
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "إفتح طبقة  أولاً ( جي بي إكس، أو أس أم ، خابية)"
 
 #~ msgid "Edit Information Office"
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 18273)
+++ applications/editors/josm/i18n/po/bg.po	(revision 18508)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-24 10:36+0000\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-04 06:14+0000\n"
 "Last-Translator: pl71 <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:07+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Създаване на интерфейса"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Помощ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнориране на неправилна препратка: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,14 +98,14 @@
 msgstr "Внимание"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнориране неправилен адрес на файл: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
@@ -119,13 +113,12 @@
 "<html>Невъзможно четенето от файла ''{0}''.<br> Грешката е: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -133,23 +126,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -157,5 +151,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -164,21 +158,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -187,5 +182,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -198,17 +193,9 @@
 msgstr "Грешка"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "НЕИЗВЕСТНО"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "За програмата"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Покажи екран с информация за програмата."
@@ -216,37 +203,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Редактор"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../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:141
+#: ../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:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Домашна страница"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Съобщаване на грешки"
@@ -256,5 +243,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -262,33 +249,29 @@
 msgstr "Данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "За прочитане"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Ревизия"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Участници"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Лиценз"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Разширения"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "За JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Файлът не може да бъде намерен."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -324,42 +307,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -367,5 +349,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -378,19 +360,19 @@
 msgstr "Моля, изберете поне една качена вече точка, линия или връзка."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Моля, изберете слой за целта"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Изберете целеви слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Обединение"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -401,50 +383,50 @@
 "обедини.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Няма слоеве за целта"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Добавяне на точка..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Добавяне на точка чрез въвеждане на нейната широчина и дължина."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Редактиране: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Въведете координати за новата точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Използване на десетични градуси."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Отрицателни стойности обозначават западното/южното полукълбо"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -453,5 +435,5 @@
 msgstr "Географска ширина:"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -460,27 +442,27 @@
 msgstr "Географска дължина:"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../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:36
+#: ../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:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -490,5 +472,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -504,30 +486,28 @@
 msgstr "Инструмент: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../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:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -537,84 +517,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../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:32
+#: ../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:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "избор"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "конфликт"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "свалено"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Показване на {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Промяна на мащаба за да може да се види {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Изглед: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Няма нищо избрано за показване."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Няма конфликти за показване."
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Затваряне на отворени пакети с промени"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Затваря отворени пакети с промени"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -622,37 +602,37 @@
 msgstr "Файл: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Няма отворени пакети с промени"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Няма отворени пакети с промени"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Зареждане на отворени пакети с изменения"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../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:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Обединява няколко отделни линии в една."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Промени посоката?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Връщане и Комбиниране"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -662,5 +642,5 @@
 "посоката на някои от тях?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -670,41 +650,41 @@
 "последователност от възли)."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Обединяване {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Моля, изберете поне две линии за комбиниране."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Копиране"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Копиране на избраните обекти в буфера за обмен."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Създаване окръжност"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Създаване на окръжност от три избрани точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Тези точки не са в окръжност. Излизане."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -712,16 +692,14 @@
 msgstr "Изберете точно 2 или 3 точки или път с точно 2 или 3 точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -733,5 +711,5 @@
 msgstr "Изтриване"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Изтриване на избраните обекти."
@@ -739,6 +717,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -752,74 +730,51 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../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:30
+#: ../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:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Сваляне от OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Сваляне на картографски данни от OSM сървър."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Сваляне"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "ОК"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Моля изберете поне един тип данни за сваляне."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Изтегляне на примитиви отнасящи се до един от избраните примитиви."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, fuzzy, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "Очаква се ID > 0. Имаме {0}."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -828,39 +783,39 @@
 msgstr "Параметърът ''{0}'' не трябва да е празен"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "{0} конфликт(а) при въвеждането"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Проблеми при свалянето"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Зареждане родителите на примитива {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr "({0}/{1}) Зареждане на родителите на възел {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Зареждане родителите на примитива {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr "({0}/{1}) Зареждане на родителите на път {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Зареждане родителите на примитива {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr "({0}/{1}) Зареждане на родителите на релация {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Дублиране"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr ""
@@ -871,41 +826,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Изход от програмата."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Всички формати"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Експорт до GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Експорт на данните до GPX файл."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Няма нищо за експорт. Първо съберете някакви данни."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -944,6 +899,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -962,9 +917,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -984,5 +939,5 @@
 msgstr "Параметърът {0} не трябва да е празен"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -990,36 +945,36 @@
 msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Експорт в GPX файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+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:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../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:16
+#: ../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/JoinNodeWayAction.java:29
 #: ../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:29
+#: ../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:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Свързване на точка с линия"
@@ -1029,170 +984,188 @@
 msgstr "Няма бърза клавишна комбинация"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Обединение на слоя"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Обедини точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Обедини точките в най-старата от тях."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Моля, изберете поне две точки за обединение."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Прекъсване..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Точките не могат да се обединят: Ще трябва да се изтрие линия, който вече се "
 "използва."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Обедини {0} точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../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:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../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:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Обръщане огледално на избраните възли и пътища."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "нагоре"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Преместване обекти {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "надолу"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "наляво"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "надясно"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Преместване {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Премества обектите {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Невъзможно да се премества обектите извън границите на света."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Нов"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Създай нова карта."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Отвори..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Отваряне на файл."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Отваряне на файлове"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Отваряне на файла ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Отваряне на връзка URL."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "На отделен слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+msgstr "Изберете, в случай, че данните трябва да бъдат свалени в нов слой"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Въведете URL за сваляне:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+msgstr "Въведете URL откъдето да се свалят данните"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Местоположение на изтеглянето"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "URL за сваляне"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+msgstr "Начало на свалянето на данни"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Сваляне на данни"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Ортогонализиране"
@@ -1203,18 +1176,18 @@
 "Преместване на точките, така че аглите между линиите да са 90 или 270 градуса"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1223,9 +1196,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1237,36 +1210,37 @@
 "избягване на това предупреждение.<br>Ще продължите ли?</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+msgstr "Използване"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Ортогонализиране"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Поставяне"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Поставяне на съдържанието на буфера"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../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:32
+#: ../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:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1275,5 +1249,5 @@
 msgstr[1] "Поставяне на {0} етикета"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1282,59 +1256,59 @@
 msgstr[1] "за {0} примитива"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Настройки…"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Отваряне страница с предпочитания за глобалните параметри."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Повтаряне на последното отменено действие."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Също преименувай файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../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/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Промяна посоката на линиите"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Обръща посоката на линиите на всички избрани пътища."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Моля, изберете поне една линия."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Промяна посоката на линиите"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1342,10 +1316,10 @@
 msgstr "Запазване"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Запазване на текущите данни."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1396,21 +1370,21 @@
 msgstr "Запис на слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Запазване като…"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Записване на текущите данни в нов файл."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Избиране на всичко"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1420,10 +1394,10 @@
 "обекти също."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Показване статус"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1431,19 +1405,19 @@
 "грешката."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Помощ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Статус Репорт"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Копиране в клипборда и затваряне"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1452,18 +1426,18 @@
 msgstr "Затваряне"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Разделяне на линия"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Разделяне на линията в избраната точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Текушата селекция не може да се използва за разделяне."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1471,5 +1445,5 @@
 msgstr[1] "Избраните точки не са в средата на път."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1485,9 +1459,9 @@
 "изберете и пътя."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Избраните точки не се явяват част от един и същ път."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1495,6 +1469,6 @@
 msgstr[1] "Избраният път не съдържа избраните точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
@@ -1502,5 +1476,5 @@
 "път."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1531,61 +1505,61 @@
 msgstr "Разделяне път {0} на {1} части"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../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:15
+#: ../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:15
+#: ../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:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Разсъедини пътища"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Дублиране на точки, които се използват от няколко линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Тази точка не е свързана с към нещо друго."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Никой от тези точки не са прикрепени за нещо друго."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Нито една от тези тези линии не е прикрепена за други"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Текущато избраните обекти не може да се разсъединят."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Изберете един от вариантите:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Един маркиран възел, или"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Една точка, която се използва от няколко линии, или"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 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:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1593,5 +1567,5 @@
 "* Една линия, която има точки, които се използват от няколко линии, или"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1600,5 +1574,5 @@
 "няколко линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1611,9 +1585,9 @@
 "дублирани възли и всички възли ще бъдат избрани."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Незапелен възел"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1621,80 +1595,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Дублирай {0} точки в {1} точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Отменяне на последното действие."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Размаркиране всичко"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Сваля избора от всички обекти."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Размаркиране всичко (focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Размаркиране всичко (escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Обновяване на данните"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "качване на всички промени в текущия слой данни към сървър на OSM."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Актуализиране на данните"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Няма открит текущ набор от данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Обновяване на избраните елементи"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr "Обновява избраните обекти от сървъра (сваляне отново на данните)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Обновява избраното"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Няма избрани примитиви за обновяване."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Няма нищо избрано."
@@ -1706,8 +1681,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "качване на всички промени в текущия слой данни към сървър на OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1718,5 +1694,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1724,29 +1700,29 @@
 msgstr "Няма промени за качване."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Нищо за качване. Първо създайте някакви данни."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+msgstr "Синхронизиране само на възел {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+msgstr "Синхронизиране само на пътя {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+msgstr "Синхронизиране само на релацията {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Синхронизиране на целия набор данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1768,11 +1744,11 @@
 "редактирането.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Забелязани са конфликти"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1788,5 +1764,5 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1796,24 +1772,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Пакета с изменения е затворен"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Разрешение на конфликт"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr "Затваряне на прозореца и продължаване на редактирането с JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1824,30 +1798,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
-"Предупреждение: Началната част \"{0}\" не отговаря на очаквания шаблон \"{1}"
-"\"!"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Качването <strong>не стана</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Качването към OSM API пропадна."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Обновяване на примитива."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1856,17 +1819,32 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Качване на данни..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Качване на избраното"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1885,11 +1863,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Увеличаване"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Намаляване"
@@ -1969,21 +1947,17 @@
 msgstr "По-бавно възпроизвеждане"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Сваляне на GPS данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Свалени GPX данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Изходни GPS данни"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Сваляне на данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1992,27 +1966,39 @@
 "Игнориране на грешката защото свалянето беше отказано. Грешката бе: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "В тази зона няма намерени данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap данни"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../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:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "Следните грешки се получиха по време на масовото сваляне:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Грешки при Сваляне"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Актуализиране на данните"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "видимо (на сървъра)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Игнориране"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Прекъсване на качването и продължаване с редактирането"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2024,7 +2010,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Изтрити или преместени примитиви"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Следните грешки се получиха по време на масовото сваляне:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Грешки при Сваляне"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Грешки при Сваляне"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2046,5 +2047,5 @@
 msgstr "Режим: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2075,38 +2076,38 @@
 msgstr "избран"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 msgid "Add node"
 msgstr "Добавяне на точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Добавяне на точка към път и съединяване"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Създаване нов възел."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Избиране на точката под курсора."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2115,14 +2116,14 @@
 msgstr[1] "Вмъкване на нов възел в {0} пътя."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "Започване на нов път от последния възел."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Продължаване на път от последния възел."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Завършване на чертането."
@@ -2142,5 +2143,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника."
@@ -2152,5 +2153,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпуснете бутона на мишката за да спрете въртенето."
@@ -2213,5 +2214,5 @@
 msgstr "Винаги да се премества и този прозорец да не се показва повече"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2220,5 +2221,5 @@
 "най-близката точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2230,4 +2231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Мащаб"
@@ -2248,5 +2250,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Търсене..."
@@ -2347,20 +2348,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - обекти с дадено количество възели / точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - всички променени обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - всички избрани обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - всички непълни обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - всички немаркирани обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2368,15 +2376,15 @@
 "<b>child <i>израз</i></b> - всички обекти наследници, отговарящи на израза"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 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:120
+"<b>parent <i>израз</i></b> - всички родители на обектите отговарящи на израза"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 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:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2384,9 +2392,9 @@
 "ключ съдържа двоеточие)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Използвайте <b>(</b> и <b>)</b> за да групирате изрази"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2396,51 +2404,51 @@
 msgstr "Филтър"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Търсене"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "Приемане на филтър"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Стартиране търсене"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Не е намерено съвпадение за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Намерени са {0} съвпадения"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2476,26 +2484,40 @@
 "връзка."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Неочакван знак: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Липсват параметри за \"ИЛИ\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Липсват параметри за \"НЕ\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Липсва затваряща скоба."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Грешен брой параметри на оператора за точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Некоректна стойност на оператора за възли: {0}. Операторът за възли очаква "
+"числова стойност, възел или диапазон, например, 10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Грешен брой параметри на оператора за точки."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2506,5 +2528,5 @@
 "числова стойност, възел или диапазон, например, 10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2605,4 +2627,20 @@
 msgstr "Циклични зависимости"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "ОК"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2620,8 +2658,8 @@
 msgstr "Добавяне на отношение {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Изтрити {0} обекта"
+msgstr "Добавени {0} обекта"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2704,5 +2742,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Двоен конфликт"
@@ -2739,4 +2777,15 @@
 "невъзможно е разрешаването на конфликт, за който няма предложено решение."
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "Параметърът ''{0}'' не трябва да е празен."
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2767,33 +2816,6 @@
 msgstr[1] "Изтриване на {0} отношения"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Конфликтиращи релации"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Изтриване от връзка"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.<br>Да го "
-"изтрием ли от релацията?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>Избраният обект \"{0}\" е част от релация \"{1}\".<br>Да го изтрием ли "
-"от релацията?</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Разделяне пътен сегмент"
@@ -2801,6 +2823,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2812,5 +2834,5 @@
 "не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Потвърждение за изтриване"
@@ -3000,15 +3022,30 @@
 msgstr "Автоматично поправяне на маркерите"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Текущата стойност е ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Внимание: неуспешно записване на предпочитанията в ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Грешка в конфигурационния файл на линии {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3019,5 +3056,5 @@
 "предпочитания ''{0}'' не е директория."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3026,5 +3063,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3035,5 +3072,5 @@
 "на липсваща директория за параметри: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3044,5 +3081,5 @@
 "липсваща директория за параметри: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3050,5 +3087,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3057,5 +3094,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3064,5 +3101,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3071,5 +3108,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3078,19 +3115,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Предпочитанията са записани на {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Невъзможно да се качат предпочитанията. Причина: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Невъзможно да се заредят предпочитанията от сървъра."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3101,5 +3161,27 @@
 "сигурността. Изключение на ОС: {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+"Пропадна зареждането на отметки от ''{0}'' поради причини свързани със "
+"сигурността. Изключение на ОС: {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "НЕИЗВЕСТНО"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3121,20 +3203,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "Ю"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "С"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "З"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "И"
@@ -3146,4 +3228,18 @@
 msgid "Changeset {0}"
 msgstr "Списък с промени {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3210,14 +3306,14 @@
 msgstr "Предупреждение: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "Очакваше се ID >= 0. Имаме: {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "Примитив с ID = 0 не може да бъде невидим."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3225,5 +3321,5 @@
 msgstr "Очаква се ID > 0. Имаме {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3250,6 +3346,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3309,113 +3405,113 @@
 msgstr "параметърът {0} не е в интервала 0..{1}, той е {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Път, обознаващ граница на област, не е затворен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "мултиполигонен път ''{0}'' не е затворен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "В релацията има член ''{0}'', който е бил изтрит."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Пътя ''{0}'' е с по-малко от две точки."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Повече от един път \"от\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Повече от един път \"до\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Повече от един \"през\" са открити."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестна роля ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестен тип членство за ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Не е намерен път \"от\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Не е намерен път \"до\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Не е открит възел или път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Пътят \"до\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Пътят \"от\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Пътят \"до\" не започва или свършва в път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стил за ограничение {0} не е намерен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Пресичане между пътища ''{0}'' и ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Вътрешният път ''{0}'' се намира отвън."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Не-Път ''{0}'' в мултиполигон."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Липсва външен път за мултиполигон ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Пресичане между пътища ''{0}'' и ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Вътрешният път ''{0}'' се намира отвън."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3431,11 +3527,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "текст"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3451,5 +3546,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3460,5 +3554,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3487,5 +3580,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "фон"
@@ -3520,12 +3613,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Ламбертова зона (Франция)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Ламбертова зона (Франция)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3561,5 +3652,5 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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>"
@@ -3568,5 +3659,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3595,5 +3686,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "железопътна линия"
@@ -3610,4 +3701,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3621,35 +3714,35 @@
 msgid_plural "{0} members"
 msgstr[0] "{0} член"
-msgstr[1] "{0} членове"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+msgstr[1] "{0} члена"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Нарушение на предварителното състояние"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Изключение свързано със сигурността"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Изключение свързано с мрежата"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "Входно-изходно изключение"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Вътрешна грешка в сървъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Лоша заявка"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr "Не е намерен"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3657,16 +3750,16 @@
 msgstr "Конфликт"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Неизвестен хост"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr "Обектът е изтрит"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3679,4 +3772,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Зареждане на \"Съобщение на деня\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Затваряне на диалоговия прозорец"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3746,74 +3844,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Потребителско име"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "използване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Показване на тази помощ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Стандартен параметри на unix геометрия"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Сваляне на област в предала на рамка"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Отваряне на файл (како GPS данни, ако е .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Сваляне на област от рамка, като GPS данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Избор с даденото търсене"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Стартиране в максимизиран режим"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Възстановяване на параметрите по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Избор език."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/път/към/папката/на/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3822,9 +3920,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "примери"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3834,25 +3932,25 @@
 "че зареждате данни преди --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Вместо --download=<bbox> може да укажете osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Активиране обновените разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Зареждане на ранните разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Настройки по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Зареждане на разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3865,11 +3963,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3894,6 +3992,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3994,25 +4092,22 @@
 msgstr "(няма обект)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "Потребител:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "слоя не е в списъка."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Слоя ''{0}'' трябва да бъде в списъка от слоеве"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Грешка при разбор"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Файлът не е намерен"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Не, отказване на операцията"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4034,5 +4129,5 @@
 msgstr "unset: не променяйте стойността на този параметър на избраните обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4061,24 +4156,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Изтриване на {0} обект"
-msgstr[1] "Изтриване на {0} обекта"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Изтриване на {0} обект"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "не е изтрито"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Релация"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4090,5 +4182,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4137,5 +4229,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4152,5 +4244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4352,8 +4444,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4667,6 +4759,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4680,6 +4772,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4737,36 +4829,36 @@
 msgstr "Тяхната база данни не съдържа етикет с ключ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Приложи"
@@ -4778,5 +4870,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "всички"
@@ -4866,4 +4958,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4874,4 +4968,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4885,49 +4980,84 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Замяна"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "Запази моят"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Роля:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+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 ""
+
+#: ../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:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Качването <strong>не стана</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Стойност:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "Приложи тази роля към всички членове"
@@ -4964,6 +5094,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5050,10 +5180,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5120,5 +5247,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5163,4 +5291,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Активиране"
@@ -5186,6 +5315,6 @@
 msgstr "Информация за слоя"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5194,22 +5323,22 @@
 msgstr[1] "Това ще промени до {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Празна стойност изтрива ключа."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<различни>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Промени стойностите?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5218,69 +5347,73 @@
 msgstr[1] "Промяна параметрите на {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Моля, изберете ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Изберете стойност"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Моля, изберете обектите, чиито параметри искате да промените."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Параметри/Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Параметри на избраните обекти"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Член на"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Добавяне на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавяне на нова двойка ключ/стойност за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Редактиране на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit the value of the selected key for all objects"
 msgstr "Редактиране стойността на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойства: {0} / Членство: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Параметри / Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Промяна на връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Изтриване от връзка"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Изваждане на избраните обекти от релация {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Изтриване на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Изтриване на параметри"
@@ -5288,40 +5421,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Връзки"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Отваряне списъка с всички релации"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Връзки: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Редактиране на релацията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Изтриване на избраната връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Създаване на нова релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Изтриване на избраната връзка"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Изберете един от вариантите:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Свали избраните връзки"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Сваляне членове"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5348,5 +5501,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5358,9 +5511,9 @@
 msgstr "Избрано: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Отсъедини панела"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5369,5 +5522,5 @@
 "левия панел."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела"
@@ -5449,5 +5602,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Свали членовете на връзките"
@@ -5479,23 +5633,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Етикети и членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+msgstr "Родителски релации"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr "Подчинени релации"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5504,14 +5658,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5521,9 +5675,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5533,15 +5687,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5549,5 +5703,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5555,20 +5709,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr "Редактор на отношения: Премахване на избраното"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5577,67 +5731,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Сортиране на членовете на връзката"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "Редактор на връзки: Сортиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Преместване на текущо избраните членове нагоре"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "Редактор на връзки: Преместване нагоре"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Преместване на текущо избраните членове надолу"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "Редактор на връзки: Преместване надолу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr "Премахване на текущо избраните членове от тази връзка"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "Редактор на връзки: Премахване"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr "Изтриване на текущо редактираната врзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "Да, създай конфликт и затвори"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Да, създай конфликт и затвори"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "Не, продължава редактирането"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5646,9 +5799,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "Конфликт в данните"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5657,41 +5810,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Прилагане на обновяването и затваряне на прозореца."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Добави празен етикет"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Сваляне всички непълни пътища и възли от връката"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Сваляне членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr "Редактор на връзки: Сваляне на членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Установява роля за избраните членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Приложи роля"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5701,17 +5854,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "Да, приложи го!"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "Не, не прилагай!"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr "Потвърди празна роля"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5722,13 +5875,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5742,14 +5895,14 @@
 msgstr "Свързано"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5758,13 +5911,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
 msgid "including immediate children of parent relations"
-msgstr ""
+msgstr "включително непосредствените наследници на родителските релации"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
 msgid "Load parent relations"
-msgstr "Зареждане на родителските връзки"
+msgstr "Зареди родителските релации"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
 msgid "Loading parent relations"
-msgstr ""
+msgstr "Зареждане на родителските релации"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
@@ -5799,60 +5952,89 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Не сте свързан"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Сортиране на членовете на връзката"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Сортиране на членовете на връзката"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Отметки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Моля, въведете първо желаните координати."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#, fuzzy
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "Няма отворен сисък с промени."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Създаване на граница"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Преместване на текущо избраните членове надолу"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Моля въведете име на мястото."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Изберете първо отметка"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Преместване на текущо избраните членове нагоре"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Преместване на текущо избраните членове нагоре"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "мин. ширина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "мин. дължина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "макс. ширина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "макс. дължина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5862,22 +6044,74 @@
 "за сваляне)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Рамка"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Източници и типове данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap данни"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Разделяне на линията в избраната точка."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Изходни GPS данни"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Избраният път не съдържа избраната точка."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Свали като нов слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Област за сваляне"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Сваляне"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Не е избрана връзка"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5885,337 +6119,64 @@
 "обработка на заявката."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Областта за сваляне е ОК, размерът е приемлив за сървъра."
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Преместване на текущо избраните членове нагоре"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Моля, изберете ред за редактиране"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Въведете име на място за търсене:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Въведете име на място за търсене:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Грешка! Възможно е да липсват маркери (тагове)."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Моля задайте низ за търсене"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Не могат да се получат резултати от търсене от сървъра"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Въведете име на място за търсене:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Места"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "тип"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "близо"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "мащаб"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Интерактивна карта"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "мащаб"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x от"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "до"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y от"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Номера квадранти"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
 #, fuzzy
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr "ВНИМАНИЕ: неуспех диалога да бъде винаги отгоре: Грешката бе: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "Историята на възел {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "историята на път {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "Историята на отношение {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Затваряне на диалоговия прозорец"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Зареди историята"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Възел {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Път {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Връзка {0}"
+msgid "Search ..."
+msgstr "Търсене..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Посока в която да се търси земя"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6572,4 +6533,6 @@
 #. 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" />
@@ -6950,6 +6913,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7015,11 +6979,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7029,6 +6993,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7038,79 +7002,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Име"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Тип"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "близо"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Интерактивна карта"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "мащаб"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x от"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "до"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y от"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Номера квадранти"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "Историята на възел {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "историята на път {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "Историята на отношение {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Затваряне на диалоговия прозорец"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Зареди историята"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Възел {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Път {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Връзка {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Потребител"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7192,4 +7423,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7482,6 +7714,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0} обект за промяна:"
@@ -7583,7 +7815,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
-msgstr ""
+msgstr "Подготовка на примитивите за качване ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63
@@ -7611,59 +7852,59 @@
 msgstr "Продължаване на качването"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Изображения за {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Прочитане GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Не е указано време за точка {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Невъзможно да се прочете времето \"{0}\" от точка {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Четене {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Не е намерено изображение с информация за времето."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Четене {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Изображения с данни за местоположение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS Начало: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS Край: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "текуща разлика: {0} с."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "разлика в часови пояси: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7671,51 +7912,51 @@
 msgstr[1] "изображения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} в пределите на следата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Синхронизация часовник"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Изображения JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Невъзможно е да се прочете датата от файла \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Липсва EXIF време във файла \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Изображение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Въведете указаната дата (мм/дд/гггг ЧЧ:ММ:СС)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Часова зона на GPS устойството (разлика със снимките)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Синхронизиране времето с GPS приемника"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Въведенето време не може да бъде използвано."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7723,30 +7964,30 @@
 msgstr "GPS точка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Настройка рисуването на линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Използвай глобалните настройки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Чертай линии между точките на този слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Не чертай линии между точките на този слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Избиране варианти за чертане на линиите."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7754,5 +7995,5 @@
 msgstr "Избор цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7761,5 +8002,5 @@
 msgstr "По подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7768,43 +8009,43 @@
 msgstr "Изберете цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Маркери от наименувани точки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Наименувани точки от следа от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Импорт Аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave аудио файлове (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудио маркери от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Импорт на изображения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Название: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7814,28 +8055,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Дължина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7844,5 +8085,5 @@
 msgstr[1] "{0} маршрути, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7851,10 +8092,10 @@
 msgstr[1] "{0} точки на интерес"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Преобразувай в слой данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7864,11 +8105,11 @@
 "<br>Ако искате да качвате следи, погледнете тук:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7878,29 +8119,29 @@
 msgstr "Преобразувано от: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Свали от OSM по дължина на тази следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Свали всичко в пределите на:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метри"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Максимална област за една заявка:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7911,13 +8152,9 @@
 "Продължаване?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7927,5 +8164,5 @@
 "са пропуснати или преместени в началото."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7935,23 +8172,23 @@
 "смислено да се предположи тяхното време, бяха пропуснати."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Слой Данни {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "извън областта за сваляне"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7960,39 +8197,56 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Затваряне на прозореца и продължаване на редактирането с JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} изтрити.)"
+msgstr[1] " ({0} изтрити.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} се състои от:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} изтрити.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "неустановена"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "API версия: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8165,6 +8419,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8179,6 +8431,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8364,5 +8614,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8705,21 +8955,20 @@
 msgstr "Език"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Използване на вградените настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
-msgid "Map Paint Styles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
+#: ../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:49
@@ -8733,6 +8982,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Обновяване"
@@ -8885,68 +9133,103 @@
 msgstr "Бърз клавиш"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Активиране"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "Автор: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Страница: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Версия: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Копиране на подразбиращите се"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Моля изберете ред за копиране."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
 msgstr "Изтриване на източник от списъка"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Редактиране стойността на избрания ключ за всички обекти"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Добавяне на нов етикет"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Затваряне на избраните отворени списъци с промени"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Редактиране избрания източник."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Качване на данни за слой ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Сортиране меню шаблони"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9154,5 +9437,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Повече информация за тази възможност"
@@ -9217,16 +9500,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Група шаблони ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Група шаблони ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9234,5 +9517,5 @@
 msgstr "Свързване с OSM Сървър..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9343,5 +9626,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Грешка при разбор: невалидна структура на gpx документа"
@@ -9569,5 +9852,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9594,5 +9877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9600,5 +9883,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9611,5 +9894,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9620,33 +9903,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Грешна парола или потребителско име."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Внимание: Паролата ще бъде предадена нешифрирана."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Съхрани потребителското име и паролата (нешифрирано)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Въведете парола"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Вход"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Основен URL адрес на OSM сървъра (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9655,17 +9938,17 @@
 "парола."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Основен URL адрес на сървъра"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM парола"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9762,5 +10045,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9769,19 +10052,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
@@ -9789,20 +10072,20 @@
 "<relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9810,19 +10093,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Непълна спецификация <member> с ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Недопустим обект с id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9831,7 +10114,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9841,25 +10128,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9867,5 +10154,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9874,5 +10161,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9880,5 +10167,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9887,15 +10174,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Подготовка на OSM данните..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
-msgstr ""
+msgstr "Подготвяне на базата данни ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:55
@@ -9904,14 +10191,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Сваляне от OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -10023,15 +10309,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Обновяване разширения"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Зареждане на разширенията"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10044,29 +10330,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "{0} добавка е успешно свалена. Моля, рестартирайте JOSM."
 msgstr[1] "{0} добавки са успешно свалени. Моля, рестартирайте JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Сваляне на добавката {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Пропускане на свалянето"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Сваляне на добавка"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Пропусни свалянето"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10078,10 +10368,10 @@
 msgstr "В разширение {0} възникна грешка"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr "Зареждането на добавката {0} беше заявено, но тя не се изисква повече."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10091,50 +10381,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Последно обновление на модула преди повече от {0} дни."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Обновяване разширения"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Добавката {0} изисква програмата JOSM да бъде обновена до {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Разширение {0} се изисква от разширение {1}, но не беше открито."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Добавката не е открита: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Последно обновление на модула преди повече от {0} дни."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Може да промените броя дни преди да се появи това предупреждение "
-"отново<br>чрез задаването на конфигурационната опция 'pluginmanager."
-"warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Невъзможно зареждането на модул {0}. Да се премахне ли от настройките?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Изключване на разширение"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Запазване на добавка"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10144,9 +10442,9 @@
 "право да презаписва текущите."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10156,10 +10454,10 @@
 "\"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Съгласно информацията в добавката, авторът е {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10168,9 +10466,9 @@
 "за грешка."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Разширението да бъде ли изключено?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10180,22 +10478,22 @@
 "да изключим разширенето."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr "Добавката не може да бъде премахната. Вероятно е изключена."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Информация за добавка"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "няма описание"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Още подробности"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10204,18 +10502,18 @@
 msgstr[1] "Сваляне на информация за добавките от {0} сайта"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Информация за разширението не е намерена."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Добавката {0} не е достъпна. Обновяването е пропуснато."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Всички инсталирани разширения са последна версия."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10228,9 +10526,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Сваляне на липсващи разширения"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10245,9 +10543,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10269,19 +10567,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "неизвестно"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Версия {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Разширения доставяни с JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10347,5 +10645,5 @@
 msgstr "(Текста вече е кипиран в буфера за обмен на данни)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10357,5 +10655,5 @@
 "Интернет.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10364,5 +10662,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10372,5 +10670,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10380,10 +10678,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10392,5 +10690,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10399,16 +10697,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10418,5 +10716,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10425,5 +10723,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10432,5 +10730,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10439,10 +10737,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10451,10 +10749,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10465,5 +10763,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10473,5 +10771,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10482,5 +10780,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10584,11 +10882,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10733,5 +11024,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -10747,10 +11039,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Нечетни"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10758,103 +11050,103 @@
 msgstr "Четни"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10908,46 +11200,47 @@
 "{0} км/ч"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Извличане на GPS координати от EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Започване на преглед на директории"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Един от избраните файлове е празен !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Прочитане на снимки..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Невъзможно да се вземе каноничното име на директория {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Сканиране на директория {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Намерен е празен файл в директория {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Грешка при четене на файлове от директория {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Корелиране към GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11210,5 +11503,5 @@
 msgstr "Грешка във файла {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11221,10 +11514,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11272,13 +11565,13 @@
 msgstr "Избери от..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Кадастър"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Авто-определяне източници"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11287,13 +11580,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11413,7 +11706,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Показвай координатите като"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11432,5 +11724,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11473,13 +11765,13 @@
 msgstr "Създаване на граница"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr "Изображението вече е заредено"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11610,22 +11902,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Промяна местоположение"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Посочете ново местоположения за следващата заявка"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Добавяне на нов слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Местоположение"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11635,5 +11927,5 @@
 "пунктуацията известни от  www.cadastre.gouv.fr .</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Добавяне на нов слой"
@@ -11647,9 +11939,9 @@
 msgstr "Взимане ново cookie (изтичане на сесията)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr "Експортирай във формат PNG (само растерни изображения)"
@@ -11669,9 +11961,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "Настройване позицията на WMS слоя"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11695,5 +11986,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Празен слой"
@@ -11722,5 +12013,5 @@
 msgstr "Комуна bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11731,18 +12022,18 @@
 "Моля, създайте нов кеш."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Грешка на кеш формата"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Грешка в кеширането на Ламбертовата зона"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11839,5 +12130,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Никакви данни не са заредени."
@@ -12246,7 +12537,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "вода"
@@ -12460,33 +12751,33 @@
 msgstr "LiveGPS слой"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Записване на GPS следа"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Свързване с gpsd сървъра и показване на текущата позиция на слоя LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Центриране веднъж"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Центриране на LiveGPS слоя към текущата позиция."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Авто-Център"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Постоянно центриране на LiveGPS слоя към текущата позиция."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12576,24 +12867,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12747,4 +13038,9 @@
 msgstr "изпълним файл на Firefox"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Слой / Ниво"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12794,31 +13090,31 @@
 msgstr "Позволени действия"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../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:124
+#: ../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:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Желаете ли да разрешите това?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Потвърждение на действието на дистанционното управление"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12839,7 +13135,5 @@
 msgstr "Не е избрана връзка"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12848,4 +13142,5 @@
 #: ../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 "Маршрутизиране"
@@ -12867,25 +13162,25 @@
 msgstr "Отваряне списък с възли на маршрут"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Изчистване маршрут"
@@ -12915,93 +13210,87 @@
 msgstr "Въведете стойности за тегло"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Интерактивна карта"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Авто мащаб: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Зареждане на квадрант"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "Показване статуса на квадрант"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Изискване на обновяване"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Показване на информация"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Зареждане на всички квадранти"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Увеличаване на мащаба"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Намаляне на мащаба"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr "Изчистване на кеша"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "изображение "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "автомащабиране"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Настройки на разширение SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Източници на квадранти"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Авто мащаб: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Автозареждане Квадранти: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Макс.мащаб ниво: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Макс.мащаб ниво: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Фон при избледняване: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "грешка при зареждане на метаданните"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "изискани: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "грешка при изискване на обновяване"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -13014,5 +13303,5 @@
 msgstr "Запис на данните във файл на всяка минута."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13179,5 +13468,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Име на улица"
@@ -13225,29 +13514,29 @@
 msgstr "Моля, изберете поне един затворен път който да бъде присъединен."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "Няма намерено пресичане. Няма направени промени."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Добавен възел на всички кръстовища"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Изтриване Пътища, които не са част от вътрешен мултиполигон"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Поправяне на релации"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Свързана само-пресичаща се област"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Свързана пресичаща област"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13257,33 +13546,33 @@
 "проверете дали няма да се появят грешки."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Въведете стойности за всички конфликти."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Разрешаване на конфликти"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Поправяне конфликти маркери"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Премахнати елементи от връзки"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Присъедини области: премахване на кратки пътища"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Затворен Път"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Премахване на маркери от вътрешни пътища"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Функция свързване на области"
@@ -13495,8 +13784,4 @@
 msgstr "Поправяне на избраните грешки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Игнориране"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13541,25 +13826,24 @@
 msgstr "Замяна на \"{0}\" с \"{1}\" за"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Брегови линии."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Този тест проверява за правилността на бреговите линии."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Неподредени брегови линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Неподредени брегови линии"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Неподредени брегови линии"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13583,18 +13867,18 @@
 msgstr "Пресичащи се пътища"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Повтарящи се точки"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Възли в една и съща позиция"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Потвърждение"
@@ -13848,4 +14132,8 @@
 msgstr "Редактиране избрания източник."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Изтриване на източник от списъка"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14061,7 +14349,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "сграда"
@@ -14075,5 +14363,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "област"
@@ -14083,25 +14371,25 @@
 msgstr "Незатворен път"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Несвързани пътища."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Края на път близо до друг път/магистрала"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Края на път близо до друг път/линия"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Възел близо до друг път"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Свързан край на път е близо до друг път"
@@ -14195,22 +14483,26 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
-#, fuzzy
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS слой ({0}), сваляне в мащаб {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr "Walking Papers: {0}"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "Достигнат е краят на реда"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14451,9 +14743,9 @@
 msgstr "Грешка във формата на файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Отворете празен WMS слой за да заредите данни от файл"
@@ -14939,6 +15231,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Означение"
@@ -15500,5 +15792,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr "метал"
@@ -15510,5 +15802,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "гора"
@@ -15796,7 +16088,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "да"
@@ -15945,8 +16237,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "не"
@@ -16073,31 +16365,4 @@
 msgstr "Редактиране пътен възел"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Тип"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16218,5 +16483,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "улица"
@@ -16251,5 +16516,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "служебна"
@@ -16284,5 +16549,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "ремонт"
@@ -16672,12 +16937,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Оператор"
@@ -16890,6 +17155,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Надморска височина"
@@ -17316,5 +17581,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "блато"
@@ -17586,5 +17851,5 @@
 #: build/trans_presets.java:1305 build/trans_presets.java:1330
 msgid "yard"
-msgstr "двор"
+msgstr "Депо"
 
 #: build/trans_presets.java:1268 build/trans_presets.java:1274
@@ -17847,25 +18112,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Работно време"
@@ -17931,24 +18196,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr "денонощно"
@@ -17961,24 +18226,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr "понеделник-петък 08:30-20:00"
@@ -17991,24 +18256,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00"
@@ -18041,6 +18306,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Ref номер"
@@ -18056,5 +18321,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "подземен"
@@ -18068,5 +18333,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Такса"
@@ -18302,5 +18567,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Навес"
@@ -18768,5 +19033,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Велосипедизъм"
@@ -18781,5 +19046,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Ски"
@@ -18933,16 +19198,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Архиологични разкопки"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Редактирай архиологични разкопки"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Забележителност"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Редактирай забележителност"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Паметник"
@@ -18950,55 +19228,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Редактирай паметник"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Редактирай крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Редактирай крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Пограничен камък"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "редактиране на: Пограничен камък"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Места за отдих и развлечения"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Редактирай аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Площадка"
@@ -19006,35 +19284,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Редактирай площадка"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Риболов"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Редактирай риболов"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Спортни съоражения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Редактирай стадион"
@@ -19048,6 +19326,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "вид спорт:"
@@ -19439,30 +19717,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "спорт"
@@ -19472,227 +19750,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Спортен център"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Редактирай спортен център"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Игрище"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Редактирай игрище"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Състезателна писта"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Редактирай състезателна писта"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Поле за голф"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Редактирай поле за голф"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Миниголф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Редактирай миниголф"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Многобой"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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"
@@ -19729,203 +20060,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Боулинг зала"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Редактирай боулинг зала"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Редактирай атлетика"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Стрелба с лък"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Редактирай стрелба с лък"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Скално катерене"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Редактирай скално катерене"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Кану"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Редактирай кану"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Редактирай велосипедизъм"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Надпреварване с кучета"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Редактирай надбягвания с кучета"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Конна езда"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Редактирай конна езда"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Конни надбягвания"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Редактирай конни надбягвания"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Редактирай гимнастика"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Моторни спортове"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Редактирай моторни спортове"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Фигурно пързаляне"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Редактирай фигурно пързаляне"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Редактирай скейтборд"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Плуване"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Редактирай плуване"
@@ -19933,56 +20264,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Редактирай ски"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Тип писта"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "спускане"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "нордическа"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "Зимен парк"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Трудност"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "начинаещ"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "лесно"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "за средно ниво"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "за напреднали"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "експерт"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "свободна езда"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Стрелба"
@@ -19990,182 +20321,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Редактирай стрелба"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Спорт (с топка)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Редактирай футбол"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Американски футбол"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Редактирай американски футбол"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Австралийски футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Редактирай австралийски футбол"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Голф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Редактирай голф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "поле за голф"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Буле (игра с мет.топчета)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Редактирай Игра с мет.топчета"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Игра с асим.мет.топки (bowls)"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Редактирай игра с асим.мет.топки"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Крикет мрежи"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Рекдатирай крикет мрежи"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Редактирай крокет"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Редактирай хокей"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Редактирай пелота"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "ракет"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Редактирай ракет"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Ръгби"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Редактирай ръгби"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Изкуствени"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Сгради"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Сграда"
@@ -20173,5 +20504,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -20179,10 +20510,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Редактирай обществена сграда"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Кметство"
@@ -20190,10 +20521,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Редактирай кметство"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Посолство"
@@ -20201,10 +20532,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Редактирай посолство"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -20213,10 +20544,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Редактирай съдебна сграда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Затвор"
@@ -20225,10 +20556,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Редактирай затвор"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -20238,10 +20569,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Редактирай полиция/милиция"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -20250,10 +20581,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Редактирай пожарна"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -20261,5 +20592,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Редактирай пощенска станция"
@@ -20267,15 +20598,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Училище"
@@ -20283,10 +20614,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Редактирай училището"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Университет"
@@ -20294,10 +20625,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Редактирай университет"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Колеж"
@@ -20305,5 +20636,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Редактирай колеж"
@@ -20311,5 +20642,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Кино"
@@ -20318,10 +20649,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Редактирай кино"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Библиотека"
@@ -20330,9 +20661,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Редактирай библиотека"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -20340,10 +20671,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Редактирай център на изкуствата"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Театър"
@@ -20352,10 +20683,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Редактирай театър"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -20365,5 +20696,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Редактирай място за богослужение"
@@ -20372,6 +20703,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Религия"
@@ -20380,66 +20711,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "Будизъм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "Християнство"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "Индуизъм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "Джайнизъм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "Юдаизъм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "Мусулманство"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "Сикхизъм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "Спиритуализъм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "Даосизъм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "Унитаристи"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "Зороастризъм"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Конфесия"
@@ -20448,81 +20779,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "Англиканска"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "Баптизъм"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "Католическо"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "Евангелска"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "Свидетели на Йехова"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "Методизъм"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "Мормони"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "Петдесетници"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "Пресвитериани"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "Протестантизъм"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "Кваркери"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "Шийти"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "Сунити"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Адреси"
@@ -20531,5 +20862,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Редактиране на информацията за адреса"
@@ -20537,5 +20868,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Номер"
@@ -20543,20 +20874,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Име на дом"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Име на град"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Пощенски код"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Код на държава"
@@ -20565,5 +20896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Редактирай интерполация на адреси"
@@ -20571,61 +20902,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Схема на номериране"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "нечетни"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "четни"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "по азбучен ред"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Цех"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Кула"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Тип на кулата"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Височина (в метри)"
@@ -20633,25 +20964,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -20659,10 +20990,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Мелница"
@@ -20670,10 +21001,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -20682,37 +21013,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Редактирай газопровод"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "нефт"
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "отходна тръба"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "подводно"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -20722,10 +21053,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Редактирай пречиствателна станция"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Кран"
@@ -20733,10 +21064,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Редактирай кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Маяк / Радиопредавател"
@@ -20744,10 +21075,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -20755,10 +21086,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -20766,5 +21097,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Редактирай видеонаблюдение"
@@ -20772,5 +21103,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -20780,35 +21111,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "въглища"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "слънчева енергия"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Електростанция"
@@ -20817,10 +21148,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -20829,5 +21160,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Редактирай електроподстанция"
@@ -20835,10 +21166,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Номер линия"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Електрически стълб от ЕПМ"
@@ -20849,23 +21180,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Редактирай стълб от ЕПМ"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr "кула"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Линия за електропренос"
@@ -20874,75 +21205,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Редактирай линия за електропренос"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Волтаж"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr "Брой проводници"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr "един"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr "два"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr "три"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr "четири"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Обществени удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Тоалетни"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Забележка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Пощенска кутия"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Телефон"
@@ -20951,5 +21282,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Редактирай телефон"
@@ -20957,5 +21288,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Монети"
@@ -20963,5 +21294,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Банкноти"
@@ -20969,5 +21300,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
@@ -20975,5 +21306,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Дебитни карти"
@@ -20981,15 +21312,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -20998,5 +21329,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Редактиране на станция за рециклиране"
@@ -21004,35 +21335,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Батерии"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Консервни кутии"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Дрехи"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Скамейка"
@@ -21041,31 +21372,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr "камък"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr "пластмаса"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr "Цвят"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr "черно"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr "кафяво"
@@ -21136,40 +21467,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "зеленина"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr "червено"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr "синьо"
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "трева"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr "бяло"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr "Брой седящи места"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Ловно скривалище"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
@@ -21178,30 +21508,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Скривалище"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Заключване"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Фонтан"
@@ -21210,10 +21540,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -21222,10 +21552,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
@@ -21233,33 +21563,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Редактирай детска ясла"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Редактирай супермаркет"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr "Аптека"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr "Редактиране на: аптека"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Бакалия"
@@ -21267,9 +21597,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Редактирай бакалия"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Будка"
@@ -21277,27 +21607,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Редактирай будка"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr "Книжарница"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr "Редактиране на книжарница"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "Туристическа агенция"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "Редактиране на туристическа агенция"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Автомат за стоки"
@@ -21305,5 +21635,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Редактирай автомат за стоки"
@@ -21311,88 +21641,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Продукти за автоматична продажба"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "билети за обществен транспорт"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "карта на обществен транспорт"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "билети за паркиране"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "храна"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "сладки"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "цигари"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "храна за животни"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "вестници"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "играчки"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "пощенски марки"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "телефонни ваучери"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "торби за екскременти"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "клиентски карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Месарница"
@@ -21400,9 +21730,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Редактирай месарница"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Фурна"
@@ -21410,9 +21740,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Редактирай фурна"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Цветарски магазин"
@@ -21420,18 +21750,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Редактирай цветарски магазин"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Био магазин"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Редактирай био магазин"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Алкохол"
@@ -21439,54 +21769,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Редактиране магазин за алкохол"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Редактиране магазин за безалкохолни"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Компютри"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Редактирай компютърен магазин"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Електроника"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Редактирай магазин за електроника"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Аудио HiFi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Редактирай магазин за Аудио HiFi"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Мебелен магазин"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Редактирай мебелен магазин"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Градински център"
@@ -21494,9 +21824,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Редактирай градински център"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Железария"
@@ -21504,9 +21834,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Редактирай железария"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Направи си сам\""
@@ -21514,54 +21844,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Редактирай магазин \"Направи си сам\""
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Книжарница"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Редактирай книжарница"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Фризьорски салон / козметика"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Редактирай фризьорски салон / козметика"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Обувки"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Редактирай магазин за обувки"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Играчки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Редактирай магазин за играчки"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Видео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Редактирай Видео-магазин"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Химическо чистене"
@@ -21569,9 +21899,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Редактирай химическо чистене"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Пералня"
@@ -21579,9 +21909,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Редактирай пералня"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Туристически стоки (за активен отдих)"
@@ -21589,28 +21919,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Редактирай мазизин за туристически стоки"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Редактирай магазин за спортни стоки"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Редактирай оптика"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Пари"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Банка"
@@ -21618,14 +21948,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Редактирай банка"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Обмяна на валута"
@@ -21633,5 +21963,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Редактирай обмяна на валута"
@@ -21639,15 +21969,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Редактирай банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Здраве"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Доктори"
@@ -21655,18 +21985,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Редактирай доктори"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Редактирай стоматолигия"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -21674,5 +22004,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Редактирай аптека"
@@ -21680,9 +22010,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Приготвят лекарства по рецепти"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Болница"
@@ -21690,10 +22020,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Редактирай болница"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -21702,5 +22032,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Редактирай пункт за връзка със спешна помощ"
@@ -21709,20 +22039,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Име на пункта"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Телефонен номер"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Използвайте международен код, като например +12-345-67890)"
@@ -21730,5 +22060,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -21737,59 +22067,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Редактирай ветеринар"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr "География"
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Места"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Държава"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Редактирай държава"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Област/Щат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Област"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Редактирай област"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Графство"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Редактирай графство"
@@ -21797,15 +22132,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Град (над 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Град (под 100 000)"
@@ -21813,10 +22148,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Редактирай град"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Квартал/предградие"
@@ -21824,25 +22159,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Редактирай квартал"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Редактирай село"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Махала"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
@@ -21850,5 +22185,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Местност"
@@ -21856,10 +22191,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Редактирай местност"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Остров"
@@ -21867,10 +22202,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Редактирай остров"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr "Скала"
@@ -21878,5 +22213,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr "Редактиране на: скала"
@@ -21884,5 +22219,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Пещерен вход"
@@ -21890,10 +22225,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Редактиране пещерен вход"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Връх"
@@ -21901,10 +22236,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Редактиране връх"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Ледник"
@@ -21912,10 +22247,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Редактиране ледник"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Вулкан"
@@ -21923,70 +22258,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Редактиране вулкан"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Граници"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Национална"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Редактирай национална граница"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Административна"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Редактирай административна граница"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Гражданска"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Редактирай гражданска граница"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Политическа"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Редактирай политическа граница"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Национален парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Редактирай граница национален парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Дърво"
@@ -21995,15 +22330,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Редактирай дърво"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Ботаническо название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Гора"
@@ -22012,5 +22347,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Редактирай гората"
@@ -22018,17 +22353,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "иглолистен"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "широколистен"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "смесен"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Гора"
@@ -22037,14 +22372,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Редактирай гора"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Природен резерват"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Редактирай природен резерват"
@@ -22052,25 +22387,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Сипей"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Редактирай сипей"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Шубрак"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Редактирай шубрака"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Скалист склон"
@@ -22078,10 +22413,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Редактирай скалист склон"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Пустош"
@@ -22089,5 +22424,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Редактиране пустош"
@@ -22095,5 +22430,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -22102,45 +22437,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Земя за лично ползване"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Редактиране на: Земя за лично ползване"
@@ -22148,25 +22483,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Градина"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Трева"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Зелено село"
@@ -22174,10 +22509,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Общи"
@@ -22185,20 +22520,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -22206,5 +22541,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Редактирай спортна площадка"
@@ -22212,15 +22547,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -22228,9 +22563,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Редактирай църковно гробище"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Гробище"
@@ -22238,39 +22573,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Редактирай гробище"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -22278,15 +22613,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Военен"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Редакирай военна земя"
@@ -22294,55 +22629,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Строителна площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Редактирай строителна площадка"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -22352,5 +22687,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Редактиране мултиполигон"
@@ -22359,10 +22694,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "външен сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -22370,5 +22705,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -22377,5 +22712,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Редактиране на ограничения при завиване"
@@ -22383,34 +22718,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "само направо"
@@ -22419,15 +22754,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "до път"
@@ -22435,5 +22770,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Маршрут"
@@ -22442,5 +22777,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Редактиране маршрут"
@@ -22448,5 +22783,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Тип маршрут"
@@ -22518,5 +22853,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22525,17 +22860,17 @@
 msgstr "велосипед"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "ски"
@@ -22588,5 +22923,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22595,13 +22930,13 @@
 msgstr "пеш"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "туристически маршрут"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "обиколка"
@@ -22615,10 +22950,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -22626,31 +22961,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Мрежа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -22659,30 +22994,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "точка за спиране назад"
@@ -23120,11 +23455,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "остарял, вече невалиден"
@@ -25148,5 +25483,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "светла_вода"
@@ -25818,4 +26153,12 @@
 #.
 #. <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"/>
@@ -25840,5 +26183,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "исторически"
@@ -25852,5 +26195,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "кариера"
@@ -25864,5 +26207,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "сметище"
@@ -25884,5 +26227,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "басейн"
@@ -25896,5 +26239,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "гора"
@@ -25908,5 +26251,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "двор ферма"
@@ -25929,5 +26272,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "търговия на дребно"
@@ -25941,5 +26284,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "индустрия"
@@ -25953,5 +26296,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "индустриални развалини"
@@ -25965,5 +26308,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "зелена площ"
@@ -25977,5 +26320,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "ЖП"
@@ -26032,7 +26375,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "военни"
@@ -26046,5 +26389,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "гробище"
@@ -26057,5 +26400,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "връх"
@@ -26070,5 +26413,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "ледник"
@@ -26082,5 +26425,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "вулкан"
@@ -26135,8 +26478,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "природа"
@@ -26150,5 +26493,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "храсталак"
@@ -26162,5 +26505,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "пустош"
@@ -26174,8 +26517,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "област"
+msgstr "гориста местност"
 
 #. color water
@@ -26187,5 +26529,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "кал"
@@ -26199,5 +26541,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "плаж"
@@ -26275,8 +26617,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "маршрут"
@@ -26324,7 +26666,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "граница"
@@ -26474,11 +26816,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "място"
@@ -26526,6 +26868,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "адрес"
@@ -26833,34 +27175,85 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Грешка при зареждане на страница {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgid "File could not be found."
+#~ msgstr "Файлът не може да бъде намерен."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Моля изберете поне един тип данни за сваляне."
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Качването към OSM API пропадна."
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Конфликтиращи релации"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A>."
+#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.<br>Да "
+#~ "го изтрием ли от релацията?</html>"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
 #~ msgstr ""
-#~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A> "
-#~ "или на <A HREF=\"{1}\">вашият език</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ "<html>Избраният обект \"{0}\" е част от релация \"{1}\".<br>Да го изтрием "
+#~ "ли от релацията?</html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Грешка при разбор"
+
+#~ msgid "File not found"
+#~ msgstr "Файлът не е намерен"
+
+#~ msgid "Replace"
+#~ msgstr "Замяна"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Моля, въведете първо желаните координати."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Изберете първо отметка"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Моля задайте низ за търсене"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Не могат да се получат резултати от търсене от сървъра"
+
+#~ msgid "name"
+#~ msgstr "име"
+
+#~ msgid "zoom"
+#~ msgstr "мащаб"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Копиране на подразбиращите се"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Моля изберете ред за копиране."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "Възможно е да се редактират само справочните страници на JOSM Online Help"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Използване шаблон ''{0}'' от група ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Използване шаблон ''{0}''"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Задаване ръчно на Ламбертова зона (напр. за местоположения между две зони)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Отваряне първо на слой (GPX, OSM, кеш)"
+#~ "(Може да промените броя дни преди да се появи това предупреждение "
+#~ "отново<br>чрез задаването на конфигурационната опция 'pluginmanager."
+#~ "warntime'.)"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Показване статуса на квадрант"
+
+#~ msgid "Request Update"
+#~ msgstr "Изискване на обновяване"
+
+#~ msgid "error loading metadata"
+#~ msgstr "грешка при зареждане на метаданните"
+
+#~ msgid "requested: {0}"
+#~ msgstr "изискани: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "грешка при изискване на обновяване"
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -26914,7 +27307,4 @@
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}."
-
-#~ msgid "Aborting..."
-#~ msgstr "Прекъсване..."
 
 #~ msgid "Unsaved Changes"
@@ -27149,4 +27539,10 @@
 #~ msgstr "Показване на панела автори"
 
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Използване шаблон ''{0}'' от група ''{1}''"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Използване шаблон ''{0}''"
+
 #~ msgid "Occupied By"
 #~ msgstr "Обект"
@@ -27313,4 +27709,11 @@
 #~ msgstr "Отваряне в браузър"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr ""
+#~ "Възможно е да се редактират само справочните страници на JOSM Online Help"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Грешка при зареждане на страница {0}"
+
 #~ msgid "Selected makes your trace public in openstreetmap.org"
 #~ msgstr "Избрано така прави вашата следа публичка в openstreetmap.org"
@@ -27334,4 +27737,11 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Наистина ли искате да маркирате проблема като ''решен''?"
+
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Отваряне първо на слой (GPX, OSM, кеш)"
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr ""
+#~ "Задаване ръчно на Ламбертова зона (напр. за местоположения между две зони)"
 
 #~ msgid "Select Tableau d'Assemblage"
@@ -27495,7 +27905,4 @@
 #~ msgstr "Възстановяване от изтриване на релация..."
 
-#~ msgid "Keep mine"
-#~ msgstr "Запази моят"
-
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Проверка дали примитив {0} е заминал..."
@@ -27602,7 +28009,4 @@
 #~ msgstr "връзки"
 
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Няма отворен сисък с промени."
-
 #~ msgid "Use a new changeset and close it"
 #~ msgstr "Използване на нов списък с промени и затваряне"
@@ -27629,4 +28033,15 @@
 #~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..."
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Страницата с помощ липсва. Създайте я на <A HREF=\"{0}\">английски</A> "
+#~ "или на <A HREF=\"{1}\">вашият език</A>."
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 18273)
+++ applications/editors/josm/i18n/po/cs.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-19 09:47+0000\n"
-"Last-Translator: Kuvaly <kuvaly@seznam.cz>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-07 21:42+0000\n"
+"Last-Translator: Martin Petricek <singularita@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:04+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Vytváří se grafické rozhraní programu (GUI)"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorují se nekorektní URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Varování"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoruji poškozený soubor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Nelze přečíst soubor ''{0}''.<br> Chyba: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Chyba"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "NEZNÁMÝ"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "O aplikaci"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Zobrazit obrazovku \"O Aplikaci\""
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Verze {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Poslední změna v {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Verze Java: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Domovská stránka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Nahlášení chyby"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Informace"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Readme"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revize"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Příspěvek"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licence"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Pluginy"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "O JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Soubor nebyl nalezen"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -318,42 +301,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -361,5 +343,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -372,19 +354,19 @@
 msgstr "Prosím, vyberte alespoň jeden již nahraný uzel, cestu nebo relaci."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Prosím vyberte cílovou vrstvu."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Vybrat cílovou vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Sloučit"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -395,50 +377,50 @@
 "být sloučeny.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Žádné cílové vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Přidat uzel..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Přidat uzel zadáním zeměpisné šířky a délky."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Úpravy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Zadejte souřadnice nového uzlu."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Použijte desetinné stupně."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Záporné hodnoty znamenají západní, resp. jižní polokouli."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -447,5 +429,5 @@
 msgstr "Zeměpisná šířka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -454,27 +436,27 @@
 msgstr "Zeměpisná délka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Seřadit uzly do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Přesunout označené uzly do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -484,5 +466,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -498,30 +480,28 @@
 msgstr "Nástroj: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Vyberte minimálně 4 uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -531,84 +511,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Seřadit uzly do přímky"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Přesunout označené uzly na přímku"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Vyberte minimálně 3 uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "stáhnout"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zvětšit na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zvětšit pohled na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Zobrazení: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 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:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Není žádný konflikt, na který by se mohlo přiblížit"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Uzavřít otevřené sady změn"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Uzavře otevřené sady změn"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -616,37 +596,37 @@
 msgstr "Soubor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Nejsou otevřené žádné sady změn"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Žádné otevřené sady změn"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Stahování otevřených sad změn..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Spojit cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Spojit více cest do jedné"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Změnit směr ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Otočit a zkombinovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -656,5 +636,5 @@
 "orientaci?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -662,41 +642,41 @@
 msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Kombinovat {0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Prosím zvolte minimálně dvě cesty ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Vybrat označené objekty pro vložení."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Prosím zvol něco ke kopírování"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Vytvořit kruh"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Vytvořit kruh ze tří uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Tyto body nejsou v kruhu. Přerušuji."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -705,16 +685,14 @@
 "Prosím, vyberte přesně dva nebo tři body nebo cestu se dvěma či třemi body."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -726,5 +704,5 @@
 msgstr "Smazat"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Smazat označené objekty"
@@ -732,6 +710,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -745,114 +723,91 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Rozdělit uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Rozdělit zvolené uzly ve stejné vzdálenosti podél přímky."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Stáhnout z OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Stáhnout data z OSM serveru"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Stáhnout"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Prosím zvol aspoň jeden úkol ke stažení"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Stáhnout prvky odkazující na jeden z vybraných prvků"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr "Očekáváno Id > 0, zadáno {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, fuzzy, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "očekáváno id > 0. Nalezeno {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
 #, java-format
 msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+msgstr "Parametr ''{0}'' nesmí být null"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Došlo k  {0} konfliktům během importu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Konflikty během stahování"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Nahrávání rodičů prvku {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr "({0}/{1}) Nahrávám rodiče uzlu {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Nahrávání rodičů prvku {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr "({0}/{1}) Nahrávám rodiče cesty {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Nahrávání rodičů prvku {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr "({0}/{1}) Nahrávám rodiče relace {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplikovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplikovat výběr kopírováním a vložením."
@@ -862,41 +817,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Konec"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Ukončit JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Všechny formáty"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Exportovat do GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exportovat data do GPX souboru."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nic nevyexportováno. Nejdříve stáhněte data."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -935,6 +890,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -953,9 +908,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -975,5 +930,5 @@
 msgstr "parametr ''{0}'' nesmí být null"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -983,36 +938,36 @@
 "''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Export GPX souboru"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
 msgstr "Historie objektu"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Zobrazit historii cest, uzlů a relací v OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Informace o prvku"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Zobrazit informace o OSM bodech, cestách nebo relacích."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Připojit uzel k cestě"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Napojit bod na nejbližší část cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Spojit uzly a linie"
@@ -1022,168 +977,186 @@
 msgstr "Beze zkratky"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Sloučit vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Sloučit aktuální vrstvu do jiné vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Spojit uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Spoj uzly do nejstaršího"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Zvolte minimálně dva uzly ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Přerušuji..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Spojit {0} uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Sloučit výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Sloučit vybrané prvky do jiné vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Zrcadlit"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Zrcadlit vybrané body a cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Zvolte minimálně jeden uzel nebo cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "nahoru"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Přesunout objekty {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "dolů"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "vlevo"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "vpravo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Přesunout {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Přesunutí objektů {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Nemohu přesouvat objekty mimo svět."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Nový"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Vytvořit novou mapu"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Otevřít..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Otevřít soubor."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Otevírání souborů"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Otevírání souboru ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Otevřít z umístění..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Otevřít soubor."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Oddělit vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+msgstr "Vyberte pokud chcete data stáhnout do nové vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Zadejte URL ke stažení:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Vložte URL ze které mají být stažena data"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Stáhnout umístění"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "URL ke stažení"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr "Začít stahování dat"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "Zavřít dialog a ukončit stahování"
 
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Stahuji data"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Ortogonalizovat tvar"
@@ -1193,18 +1166,18 @@
 msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1213,9 +1186,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1224,36 +1197,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr "Využití"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+msgstr "Vybrané prvny nelze uspořádat do pravých úhlů"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Ortogonalizovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Vložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Vložit ze schránky"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Vložit Popisky"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Použít popisky objektu ve schránce na všechny zvolené objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1263,5 +1237,5 @@
 msgstr[2] "Vkládám {0} tagů"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1271,59 +1245,59 @@
 msgstr[2] "na {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Nastavení..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Otevřít globální nastaveni"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Zrušit vrácení"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Vrátit zpět poslední vrácenou akci"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Přejmenovat vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Také přejmenovat soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Nemohu přejmenovat soubor ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Otočit cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Otočit směr všech zvolených cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Zvolte minimálně jednu cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Otočit cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1331,10 +1305,10 @@
 msgstr "Uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Uložit aktuální data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1385,21 +1359,21 @@
 msgstr "Ulož vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Uložit jako..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Uložit aktuální data do nového souboru"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1409,10 +1383,10 @@
 "objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Zobrazit zprávu o stavu"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1420,19 +1394,19 @@
 "chybovému hlášení"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Nápověda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Zpráva o stavu"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Zkopírovat do schránky a zavřít"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1441,18 +1415,18 @@
 msgstr "Zavřít"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Rozdělit cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Rozdělit cestu zvoleným uzlem"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Tento výběr nemůže být použit k rozdělení."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1461,5 +1435,5 @@
 msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1472,9 +1446,9 @@
 msgstr[2] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Zvolené uzly nesdílejí stejnou cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1483,10 +1457,10 @@
 msgstr[2] "Označené cesty neobsahují vybrané uzly."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1518,61 +1492,61 @@
 msgstr "Rozdělit cestu {0} do {1} částí"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Vypnout/Zapnout GPX linie"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Vykreslovat spojnice mezi GPS body"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Zapnout/Vypnout globální nastavení ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Rozpojit cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Zduplikovat uzly používané více cestami."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Tento uzel není přilepen k ničemu jinému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Žádný z těchto uzlů není připojen na něco jiného."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Žádný z uzlů v této cestě není připojen na něco jiného."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Tento výběr nelze použít pro oddělení uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Vyberte buď:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Jeden otagovaný uzel, nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Jeden uzel používaný více než jednou cestou, nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1581,5 +1555,5 @@
 "nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1588,5 +1562,5 @@
 "cestě."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1599,9 +1573,9 @@
 "své vlastní kopie a všechny uzly budou vybrány."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Nespojený uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1609,80 +1583,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Duplikovat uzly {0} do {1} uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Zpět"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Vrátit poslední akci."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Odznačit vše"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Odznačit všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Odznačit vše (Fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Odznačit vše (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Aktualizovat data"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Nahrát veškeré změny v aktuální datové sadě na OSM server"
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Aktualizuji data"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr "Stahuji data"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Nenalezena aktuální datová sada"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+msgstr "V aktuální datové sadě není prvek s id {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Aktualizovat vybrané"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Aktualizovat výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Nejsou vybrány žádné prvky pro aktualizaci."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Prázdný výběr"
@@ -1694,8 +1669,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr "Nahrát veškeré změny v aktuální datové sadě na OSM server"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1706,5 +1682,5 @@
 "konflikty vyřešeny.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1712,29 +1688,29 @@
 msgstr "Žádné změny k nahrání."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+msgstr "Synchronizovat pouze bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr "Synchronizovat pouze cestu {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Syncronizovat pouze relaci {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Synchronizovat celý dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1755,11 +1731,11 @@
 "pro přerušení a pokračování editace.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Objeveny konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1775,5 +1751,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1786,24 +1762,22 @@
 "sadou změn.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Sada změn byla uzavřena"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Zrušit řešení konfliktů"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr "Zavřít tento dialog a pokračovat v editování v JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1814,28 +1788,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+msgstr "Bod je stále využit"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Aktualizace <strong>selhala</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Nahrándí do OSM API selhalo"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Aktualizuji prvky"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1844,40 +1809,59 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, fuzzy, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+"Varování: prvek ''{0}'' byl již na serveru smazán. Přeskakuji tento prvek a "
+"opakuji přenos."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, fuzzy, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+"Varování: prvek ''{0}'' byl již na serveru smazán. Přeskakuji tento prvek a "
+"opakuji přenos."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Nahrávám data na serevr ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Nahrát vybrané"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
-msgstr ""
+msgstr "Nahrát veškeré aktuálně vybrané změny na OSM server."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259
 msgid "Checking parents for deleted objects"
-msgstr ""
+msgstr "Kontroluji rodiče smazaných objektů"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:318
 #, java-format
 msgid "Reading parents of ''{0}''"
-msgstr ""
+msgstr "Načítám rodiče ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:324
 msgid "Checking for deleted parents in the local dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
+msgstr "Kontroluji na smazané rodiče v lokálních datech"
+
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Přiblížit"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Oddálit"
@@ -1957,21 +1941,17 @@
 msgstr "Zpomalené přehrávání"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Stahuji GPS data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Stažená GPX data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Surová GPS data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Stahuji data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1980,27 +1960,39 @@
 "ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "V této oblasti nebyla nalezena žádná data."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Stahuji {0} z {1} ({2} zbývá)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "Během hromadného stahování došlo k následujícím chybám:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Chyby při stahování"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Aktualizuji data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "viditelný (na serveru)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignorovat"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Zrušit nahrávání na server a pokračovat v editaci"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2017,7 +2009,22 @@
 "serveru.<br>Klikněte <strong>{2}</strong> pro ignorování.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Smazané nebo přesunuté prvky"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Během hromadného stahování došlo k následujícím chybám:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Chyby při stahování"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Chyby při stahování"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2039,5 +2046,5 @@
 msgstr "Režim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2067,38 +2074,38 @@
 msgstr "vybráno"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Přidat uzel do cesty a spojit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Vytvořit nový uzel."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Vybrat uzel pod kurzorem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2108,14 +2115,14 @@
 msgstr[2] "Vložit nový uzel do {0} cest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 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:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Pokračovat v cestě od posledního uzlu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Dokončit kreslení"
@@ -2135,5 +2142,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pusťte myší tlačítko k vybrání obejktů v obdélníku"
@@ -2144,5 +2151,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Pusťte myší tlačítko k zastavení otaáčení"
@@ -2206,5 +2213,5 @@
 msgstr "Vždy přesunout a tento dialog již více nezobrazovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2212,5 +2219,5 @@
 "Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2222,4 +2229,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zvětšení"
@@ -2239,5 +2247,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Hledat..."
@@ -2340,20 +2347,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - objekt s daným počtem uzlů"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - všechny změněné objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - všechny vybrané objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - všechny nekompletní objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - všechny objekty bez tagů"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2361,5 +2375,5 @@
 "<b>child <i>výraz</i></b> - všechny podobjekty objektů odpovídajících výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2367,18 +2381,18 @@
 "<b>parent <i>výraz</i></b> - všechny rodiče objektů odpovídajících výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Použijte <b>|</b> nebo <b>OR</b> ke kombinaci s logickým \"nebo\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Použijte <b>\"</b> jako uvozovky (například pokud klíč obsahuje dvojtečku)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Použijte <b>(</b> a <b>)</b> k seskupení výrazů"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2388,51 +2402,51 @@
 msgstr "Filtrovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Hledat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "Přidat filtr"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Začít hledání"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nebyly nalezeny záznamy pro \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nic nebylo odstraněno výběrem hledáním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+msgstr "Ve výběru se nenašlo nic při hledání ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Nalezeno {0} odpovídajích výrazů"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2463,26 +2477,40 @@
 msgstr "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Neočekávaný token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Chybějící argument pro \"NEBO\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Chybějící argument pro \"NOT\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Očekávám uzavírací závorku."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Chybný počet parametrů pro operátor nodes."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Neplatná hodnota pro operátor nodes: {0}. Je očekáváno číslo, nebo rozsah "
+"čísel, například nodes:10-20."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Chybný počet parametrů pro operátor nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2493,5 +2521,5 @@
 "čísel, například nodes:10-20."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2592,4 +2620,20 @@
 msgstr "Kruhové závislosti"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2607,8 +2651,8 @@
 msgstr "Přidat relaci {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Smazat {0} objekt"
+msgstr "Přidáno {0} objektů"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2690,5 +2734,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Dvojí konflikt"
@@ -2700,4 +2744,6 @@
 "primitive ''{1}''."
 msgstr ""
+"Varovaní: Vrstva ''{0}'' již neexistuje. Nelze odstranit konflikt prvku "
+"''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -2711,5 +2757,5 @@
 msgid ""
 "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr ""
+msgstr "Nelze vzít zpět příkaz ''{0}'' protože vrstva ''{1}'' již neexistuje"
 
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
@@ -2724,4 +2770,15 @@
 msgstr "nemohu vyřešit nerozhodnutý konflikt"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parametr ''{0}'' nesmí být prázdný"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2756,32 +2813,6 @@
 msgstr[2] "Smazat {0} relací"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Konfliktní relace"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Odstranit z relace"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>Výběr \"{0}\" je použit v relaci \"{1}\" s rolí {2}.<br>Smazat z "
-"relace?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>Výběr \"{0}\" je použit v relaci \"{1}\".<br>Smazat z relace?</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Rozdělit segment cesty"
@@ -2789,6 +2820,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2800,5 +2831,5 @@
 "<br>Opravdu je chcete smazat?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Potvrďte smazání"
@@ -2820,10 +2851,10 @@
 #, java-format
 msgid "Purged object ''{0}''"
-msgstr ""
+msgstr "Odstraněný objekt ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:117
 #, java-format
 msgid "Purged {0} objects"
-msgstr ""
+msgstr "Odstraněno {0} objektů"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:160
@@ -2839,10 +2870,10 @@
 #, java-format
 msgid "Removing reference from relation {0}"
-msgstr ""
+msgstr "Odstraňování odkazu z relace {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
 #, java-format
 msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
+msgstr "Vyřešit konflikty v seznamu členů relace {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:90
@@ -2916,5 +2947,5 @@
 #, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr ""
+msgstr "Vyřešit konflikty v seznamu bodů cesty {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2988,15 +3019,30 @@
 msgstr "Automatická korekce popisků"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Výchozí hodnota je''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Poškozený konfigurační soubor na řádku {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3004,6 +3050,8 @@
 "isn't a directory."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+"Varování: Nepodařilo se načíst konfiguraci. Nastavená cesta ''{0}'' není "
+"adresářem."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3012,5 +3060,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3019,5 +3067,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3026,5 +3074,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3032,5 +3080,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3039,5 +3087,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3046,5 +3094,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3053,5 +3101,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3060,19 +3108,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Předvolby uloženy na {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Nemohu nahrát předvolby. Důvod: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Nemohu nahrát předvolby ze serveru."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3080,6 +3151,30 @@
 "{1}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+"Z bezpečnostních důvodů se nepodařilo se načíst záložky z  ''{0}''. Výjimka: "
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+"Z bezpečnostních důvodů se nepodařilo se načíst záložky z  ''{0}''. Výjimka: "
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "NEZNÁMÝ"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3101,20 +3196,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "J"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "S"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "Z"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "V"
@@ -3126,4 +3221,18 @@
 msgid "Changeset {0}"
 msgstr "Sada změn {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3142,5 +3251,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "Text"
-msgstr ""
+msgstr "Text"
 
 #. column header: apply filter for children
@@ -3190,14 +3299,14 @@
 msgstr "Varování: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "očekáváno id >= 0. Nalezeno {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "objekt s id=0 nemůže být neviditelný"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3205,5 +3314,5 @@
 msgstr "očekáváno id > 0. Nalezeno {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3230,6 +3339,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3289,113 +3398,113 @@
 msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Cesta se stylem plochy není uzavřená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Cesta v multipolygonu ''{0}'' není uzavřena."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Odstraněn prvek ''{0}'' z relace."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Cesta ''{0}'' s méně, než dvěmi body."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Nalezena více než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Nalezeno více cílových \"to\" cest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Nalezen více než jeden \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznámá role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámý typ prvku pro ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Nenazezena příchozí cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Nenalezena odchozí cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Nenalezen \"via\" uzel nebo cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Styl pro omezení {0} nenalezen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Cesty ''{0}'' a ''{1}'' se protínají."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Vnitřní cesta ''{0}'' je venku."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Ne-cesta ''{0}'' v multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Cesty ''{0}'' a ''{1}'' se protínají."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Vnitřní cesta ''{0}'' je venku."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3411,11 +3520,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "text"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3434,5 +3542,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3444,5 +3551,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3473,5 +3579,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "pozadí"
@@ -3506,12 +3612,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambertova zóna (Francie)"
+msgstr "Lambertova zóna 4 (Francie)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambertova zóna (Francie)"
+msgstr "Lambertova zóna CC9 (Francie)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3547,10 +3651,10 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+msgstr "<html>Nelze načíst záložky z<br>''{0}''<br>Chyba: {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3579,5 +3683,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "železnice"
@@ -3594,4 +3698,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3609,33 +3715,33 @@
 msgstr[2] "{0} prvků"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Porušení předpokladů"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Bezpečnostní vyjímka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Síťová vyjímka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "IO výjimka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Interní chyba serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Špatný požadavek"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+msgstr "Nenalezeno"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3643,18 +3749,18 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Neznámé jméno počítače"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+msgstr "Objekt smazán"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
-msgstr ""
+msgstr "Zobrazit informace o pomoci"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3665,4 +3771,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Stahuji zprávu dne"
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Zavřít dialog"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3732,74 +3843,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Jméno uživatele"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "použití"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Zobrazí tuto nápovědu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Standardní unixová geometrie okna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Stáhnout ohraničující box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Otevřít soubor (jako GPS trasu, pokud .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 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:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Spustit přes celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Nastavit výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Nastavit jazyk."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+msgstr "/CESTA/K/ADRESARI/JOSM/         "
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+msgstr "Změnit adresář pro všechna uživatelská nastavení"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3807,10 +3918,14 @@
 "      Java option to increase the maximum size of allocated memory"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+"poznámka: Pro některé úlohy potrebuje JOSM velké množství paměti. Může být "
+"třeba přidat následující\n"
+"      konfigurační volby Javy aby se zvětšilo nastavení maximálního možného "
+"využití ram"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "příklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3820,25 +3935,25 @@
 "selection nejprve nahrajte nějaká data."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Namísto --download=<bbox> můžete zadat osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Aktivuji aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Načítám dřívější pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Nastavuji výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Načítám pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3851,11 +3966,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3880,6 +3995,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3980,25 +4095,22 @@
 msgstr "(žádný objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "Uživatel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "vrstva není v seznamu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Vrstva ''{0}'' musí být v  seznamu vrstev"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Chyba při parsování"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Soubor nebyl nalezen"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Ne, zruš operaci"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4019,5 +4131,5 @@
 msgstr "nenastaveno: vlastnost není pro vybrané objekty nastavena"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4046,25 +4158,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Smazat {0} objekt"
-msgstr[1] "Smazat {0} objekty"
-msgstr[2] "Smazat {0} objektů"
+msgstr[0] "Mažu {0} objekt"
+msgstr[1] "Mažu {0} objekty"
+msgstr[2] "Mažu {0} objektů"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Smazat {0} objekt"
+msgstr "Smazat objekty"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "nesmazáno"
+msgstr "Ke smazání"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Vztah"
+msgstr "Z relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4076,5 +4185,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4084,9 +4193,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327
 msgid "Click to close the dialog and remove the object from the relations"
-msgstr ""
+msgstr "Klikněte pro uzavření dialogu a odstranění objektu z relací"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340
 msgid "Click to close the dialog and to abort deleting the objects"
-msgstr ""
+msgstr "Klikněte pro uzavření dialogu a zrušení mazání objektů"
 
 #. *
@@ -4123,5 +4232,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4138,5 +4247,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4343,8 +4452,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4422,4 +4531,6 @@
 "adjustment."
 msgstr ""
+"Nastaviteľný {0} ešte neregistrovaný. Nemôžem nastaviť spoluúčasť v "
+"nastavení synchronizácie."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:899
@@ -4427,5 +4538,5 @@
 #, java-format
 msgid "Adjustable {0} not registered yet."
-msgstr ""
+msgstr "Nastaviteľný {0} ešte neregistrovaný."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4666,6 +4777,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4679,6 +4790,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4736,36 +4847,36 @@
 msgstr "Cizí datová sada neobsahuje tag s klíčem {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr "Konflikty při slučování objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr "Konflikty při slučování cest - zkombinovaná cesta je ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, fuzzy, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
 msgstr "Konflikty při slučování uzlů - zkombinovaný uzel je ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr "Žádné konflikty k vyřešení"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
 msgstr "Zrušit řešení konfliktů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
 msgstr "Aplikovat vyřešené konflikty"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Aplikovat"
@@ -4777,5 +4888,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "všechny"
@@ -4787,5 +4898,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
 msgid "Please decide which values to keep"
-msgstr ""
+msgstr "Rozhodněte, které hodnoty ponechat"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73
@@ -4866,4 +4977,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4875,4 +4988,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4885,51 +4999,87 @@
 #, java-format
 msgid "Position {0} is out of range. Current number of members is {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+msgstr "Pozice {0} je mimo rozsah. Aktuální počet členů je {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Nahradit"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+msgstr "Odstranit tohoto člena z relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Odstranit tohoto člena z relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr "Zatím nerozhodnuto"
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Role:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Nastaví roli pro vybrané členy"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#, fuzzy
+msgid "Tag modified relations with "
+msgstr "Tagy z relací"
+
+#: ../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 ""
+
+#: ../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:71
+msgstr "Klíč:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Aktualizace <strong>selhala</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "Aplikovat tuto roli na všechny členy"
@@ -4949,5 +5099,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:47
 msgid "Show tags with conflicts only"
-msgstr ""
+msgstr "Zobrazit pouze tagy s konfliktem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4966,6 +5116,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4987,5 +5137,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 msgid "Resolve conflicts."
-msgstr ""
+msgstr "Vyřešit konflikty."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:332
@@ -5054,10 +5204,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5099,5 +5246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
 msgid "Apply also for children"
-msgstr ""
+msgstr "Aplikovat také na potomky"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
@@ -5120,9 +5267,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:234
 msgid "Object with history"
-msgstr ""
+msgstr "Objekt s historií"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5139,9 +5287,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:292
 msgid "Display the history of the selected objects."
-msgstr ""
+msgstr "Zobrazit historii vybraných objektů."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
 msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
+msgstr "Dialog nebyl zatím vytvořen. Zavolejte nejprve createInstance()"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
@@ -5167,4 +5315,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Aktivovat"
@@ -5190,6 +5339,6 @@
 msgstr "Informace o vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5199,22 +5348,22 @@
 msgstr[2] "Toto změní až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Prázdná hodnota smaže klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<různé>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Změnit hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5224,69 +5373,73 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Prosím zvolte klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Vyberte objekty, u kterých chcete změnit vlastnosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pro zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Upravit vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit the value of the selected key for all objects"
 msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Členství: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Odstranit z relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Opravdu smazat výběr z relace {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Smaže zvolený klíč ve všech objektech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
@@ -5294,40 +5447,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Otevřít seznam všech relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relace: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Otevřít editor pro zvolenou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Smazat vybrané relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Vytvořit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Vytvořit kopii relace a otevřít ji v novém okně"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
-msgstr ""
+msgstr "Nastavit aktuální výběr na seznam vybraných relací"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Smazat vybrané relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Vyberte buď:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Stáhnout vybrané relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Stáhnout prvky"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5354,5 +5527,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5364,9 +5537,9 @@
 msgstr "Výběr: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Vytrhnout panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5375,5 +5548,5 @@
 "nástrojů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Minimalizovat nebo maximalizovat obsah panelu"
@@ -5426,5 +5599,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210
 msgid "Missing encoding"
-msgstr ""
+msgstr "Chybějící kódování"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
@@ -5458,5 +5631,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Stáhnout členy relace"
@@ -5487,23 +5661,24 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+"Upozornění: ignoruji výjimku, protože úloha byla přerušena. Výjimka: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Značky a Členové"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr "Rodičovské relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr "Potomci relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5515,14 +5690,14 @@
 "provést s touto cyklickou závislostí?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr "Odstranit, vyčistit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorovat, ponechat relaci jak je"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5534,9 +5709,9 @@
 "''{0}''<br><br>Opravdu chcete přidat dalšího člena relace?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr "Více členů odkazuje na stejný prvek"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5549,10 +5724,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5560,5 +5735,5 @@
 "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5568,5 +5743,5 @@
 "člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5576,20 +5751,20 @@
 "člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Odstranit všechny členy odkazující na některý z vybraných prvků"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor relací: Odstranit vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "Vybrat členy relace odkazující na prvky v aktuálním výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5598,67 +5773,66 @@
 msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr "Vybrat prvky pro vybrané členy relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Seřadit členy relace"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+msgstr "Editor relací: Třídění"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Přesunout zvolené členy nahoru"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+msgstr "Editor relací: Posun nahoru"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Přesunout zvolené členy dolů"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+msgstr "Editor relací: Posun dolů"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr "Odstranit vybrané členy z relace"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "Editor relací: Odstranit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr "Smazat editovanou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "Ano, vytvořit konflikt a zavřít"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Ano, vytvořit konflikt a zavřít"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "Ne, pokračovat v editaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5667,9 +5841,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "Konflikt v datech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5678,41 +5852,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "Aplikovat aktuální změny"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Aplikovat změny a zavřít dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Zrušit změny a zavřít dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Přidat prázdnou značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Stáhnout prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr "Editor relací: Stáhnout členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Nastaví roli pro vybrané členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Aplikovat roli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5724,17 +5898,17 @@
 "role těchto prvků.<br>Opravdu chcete novou roli aplikovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "Ano, aplikovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "Ne, neaplikovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr "Potvrdit prázdnou roli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Upravit relaci na kterou odkazuje vybraný člen"
@@ -5745,13 +5919,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr "Zvětšit na prvek odkazovaný prvním členem výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Zvětšování je neaktivní protože je neaktivní vrstva s touto relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr "Zvětšování je neaktivní protože nebyl vybrán žádný člen"
@@ -5765,14 +5939,14 @@
 msgstr "Spojený"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr "Stáhnout odkazované relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr "očekáváno child.getId() >0. Nalezeno {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5789,5 +5963,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
 msgid "Loading parent relations"
-msgstr ""
+msgstr "Nahrávám rodičovské relace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
@@ -5822,60 +5996,89 @@
 msgstr "Varovaní: ignoruji výjimku protože úloha byla přerušena. Výjimka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Nepřipojeno"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr "cesta je připojena"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Seřadit členy relace"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr "cesta je připojena na předchozího člena relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Seřadit členy relace"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr "cesta je připojena na následujícího člena relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+msgstr "cesta není připojena na předchozího ani následujícího člena relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Prosím zadejte nejdříve pozadovanou pozici"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#, fuzzy
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "Aktuálně není otevřena žádná sada změn."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Vytvořit hranice"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Upravit vybranou relaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Prosím zadejte jméno umístění"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr "Jméno lokace"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Nejdříve zvolte záložku"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Přesunout zvolené členy nahoru"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Přesunout zvolené členy nahoru"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min šíř."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min dél."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "max šíř."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "max dél."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5883,359 +6086,138 @@
 msgstr "URL z www.openstreetmap.org (adresu můžete vložit do pole níže)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Ohraničující box"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Zdroje a typy dat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Rozdělit cestu zvoleným uzlem"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Surová GPS data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Označená cesta neobsahuje vybraný uzel."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Uložit jako novou vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Stáhnout plochu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Stáhnout"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Nevybrána žádná relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Stahovaná plocha je moc velká, server zřejmě odmítne váš požadavek"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Stahovaná plocha je v pořádku, velikost akceptována serverem"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Klikněte pro uzavření dialogu a zrušení mazání objektů"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Upravit vybranou relaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Zvolte řádek k editaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Zadej jméno místa které chceš najít:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Zadej jméno místa které chceš najít:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Výjimka desetinné čárky, pravděpodobně nějaké chybějící tagy."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Prosím, zadejte hledaný řetězec"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Nemohu načíst výsledky hledání ze serveru"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Zadej jméno místa které chceš najít:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Místa"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "jméno"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "typ"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "poblíž"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "Zvětšení"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Aktuální mapa"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "Úroveň zvětšení"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x z"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "až"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y z"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Čísla dlaždic"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr "JOSM prohlížeč nápovědy"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>Nepodařilo se navázat komunikaci se serverem<br>''{0}''.<br>Prosím "
-"prověřte funkčnost internetového připojení.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr "Koordináty"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "Historie pro uzel {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "Historie pro cestu {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "Historie pro relaci {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Zavřít dialog"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr "Znovu nahrát historii ze serveru"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Nahrát hostorii"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr "Nahrávám historii pro uzel {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr "Nahrávám historii pro cestu {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr "Nahrávám historii pro relaci {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Bod {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Cesta {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relace {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Hledat..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Směr hledání země"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6592,4 +6574,6 @@
 #. 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" />
@@ -6970,6 +6954,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7035,11 +7020,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7049,6 +7034,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7058,83 +7043,350 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Název"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Typ"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "poblíž"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Aktuální mapa"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "Úroveň zvětšení"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x z"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "až"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y z"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Čísla dlaždic"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, 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:164
+msgid "JOSM Help Browser"
+msgstr "JOSM prohlížeč nápovědy"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr "Nepodařilo se otevřít URL"
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr "Otevřít aktuální stránku nápovědy v externím prohlížeči"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr "Upravit aktuální stránku nápovědy"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr "Znovu načíst aktuální stránku nápovědy"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr "Přejít na předchozí stránku"
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr "Přejít na následující stránku"
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr "Jít na domovskou stránku nápovědy pro JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr "Nepodařilo se otevřít stránku s nápovědou. Cílové URL je prázdné."
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr "Nepodařilo se otevřít stránku s nápovědou."
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr "Nepodařilo se spustit externí prohlížeč"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr "Zeměpisná šířka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr "Zeměpisná délka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr "Koordináty"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "Historie pro uzel {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "Historie pro cestu {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "Historie pro relaci {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Zavřít dialog"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr "Znovu nahrát historii ze serveru"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Nahrát hostorii"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr "Očekáváno id objektu > 0. Nalezeno {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr "Nahrávám historii pro uzel {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr "Nahrávám historii pro cestu {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr "Nahrávám historii pro relaci {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Cesta {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relace {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Uživatel"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+msgstr "Sada změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
-msgstr ""
+msgstr "<html>Verze <strong>{0}</strong> vytvořená <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -7154,5 +7406,5 @@
 #, java-format
 msgid "Version {0}, {1} (by {2})"
-msgstr ""
+msgstr "Verze {0}, {1} (od {2})"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:78
@@ -7167,13 +7419,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
 msgid "Changeset id:"
-msgstr ""
+msgstr "Sada změn id:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
 msgid "Created at:"
-msgstr ""
+msgstr "Vytvořeno v:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
 msgid "Changeset comment:"
-msgstr ""
+msgstr "Komentář k sadě změn:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
@@ -7183,21 +7435,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
 msgid "<html>Please select the changesets you want to close</html>"
-msgstr ""
+msgstr "<html>Prosím vyberte sadu změn kterou chcete uzavřít</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
 msgid "Open changesets"
-msgstr ""
+msgstr "Otevřené sady změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
 msgid "Close changesets"
-msgstr ""
+msgstr "Zavřít sady změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
 msgid "Close the selected open changesets"
-msgstr ""
+msgstr "Zavřít vybrané otevřené sady změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
 msgid "Cancel closing of changesets"
-msgstr ""
+msgstr "Zrušit zavírání sad změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
@@ -7208,7 +7460,8 @@
 #, java-format
 msgid "Closing changeset {0}"
-msgstr ""
+msgstr "Zavírám sadu změn {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7236,5 +7489,5 @@
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be uploaded."
-msgstr ""
+msgstr "Vrstva ''{0}'' nemá žádné změny k nahrání na server."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60
@@ -7244,9 +7497,11 @@
 "''{1}''."
 msgstr ""
+"Vrstva ''{0}'' má změny, které by se měly uložit do odpovídajícího souboru "
+"''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr ""
+msgstr "Vrstva ''{0}'' nemá žádné změny k uložení."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80
@@ -7261,5 +7516,5 @@
 #, java-format
 msgid "Layer ''{0}'' is not backed by a file"
-msgstr ""
+msgstr "Vrstva ''{0}'' není uložená v souboru"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101
@@ -7272,5 +7527,5 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
+msgstr "Vybrat vrstvu ''{0}'' k nahrání na server ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
@@ -7320,5 +7575,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
-msgstr ""
+msgstr "Neuložená data a chybějící přiřazený soubor"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
@@ -7361,5 +7616,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save/Upload and Exit"
-msgstr ""
+msgstr "Uložit/nahrát na server a skončit"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -7371,5 +7626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
 msgid "Save/Upload and Delete"
-msgstr ""
+msgstr "Uložit/nahrát na server a smazat"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
@@ -7505,6 +7760,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0} upravený objekt:"
@@ -7542,5 +7797,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614
 msgid "Upload all changes in one request"
-msgstr ""
+msgstr "Nahrát všechny změny v jednom požadavku"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
@@ -7562,25 +7817,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685
 msgid "Open a new changeset"
-msgstr ""
+msgstr "Otevřít novou sadu změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:686
 msgid "Open a new changeset and use it in the next upload"
-msgstr ""
+msgstr "Otevřít novou sadu změn a použít ji v dalším nahrávání"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:693
 msgid "Use an open changeset"
-msgstr ""
+msgstr "Použít otevřenou sadu změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:694
 msgid "Upload data to an already opened changeset"
-msgstr ""
+msgstr "Nahrát data do již otevřené sady změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:734
 msgid "Close changeset after upload"
-msgstr ""
+msgstr "Zavřít sadu změn po nahrání."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:735
 msgid "Select to close the changeset after the next upload"
-msgstr ""
+msgstr "Vybrat pro zavření sady změn po následujícím nahrání"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:926
@@ -7593,9 +7848,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:966
 msgid "Load the list of your open changesets from the server"
-msgstr ""
+msgstr "Nahrát seznam vašich otevřených sad změn ze serveru"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:980
 msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "Zavřít zvolenou otevřenou sadu změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1032
@@ -7605,7 +7860,18 @@
 #, java-format
 msgid "Changeset ID > 0 expected. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+msgstr "Sada změn s ID > 0 očekávána. Nalezeno {0}."
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"Varování: prvek ''{0}'' byl již na serveru smazán. Přeskakuji tento prvek a "
+"opakuji přenos."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr "Připravuji objekty k nahrání na server ..."
@@ -7625,5 +7891,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
 msgid "Select objects to upload"
-msgstr ""
+msgstr "Vybrat objekty k nahrání na server"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
@@ -7633,61 +7899,61 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
 msgid "Continue uploading"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+msgstr "Pokračovat v nahrávaní"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Obrázky pro {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Číst GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Žádný čas pro bod {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Čtu {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Čtu {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS souřadnicemi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Start GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Konec GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "nynější odchylka: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "rozdíl časových pásem: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7696,51 +7962,51 @@
 msgstr[2] "obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Synchronizovat hodiny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG obrázky (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Data v souboru \"{0}\" nemohla být parsována."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "V souboru \"{0}\" není časová značka EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synchronizace času s GPS přijímačem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Zadaný čas nemůže být rozparsován"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7748,30 +8014,30 @@
 msgstr "gps bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Přizpůsobit kreslení linií"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Použít globální nastavení."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Kreslit spojnice mezi body v této vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Nereslit spojnice mezi body v této vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7779,5 +8045,5 @@
 msgstr "Přizpůsobit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7786,5 +8052,5 @@
 msgstr "Výchozí"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7793,43 +8059,43 @@
 msgstr "Zvolit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Značky z pojmenovaných bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pojmenované body z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importovat zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosoubory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importovat obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Jméno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7839,28 +8105,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+msgstr "Časový interval"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "Délka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Délka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7870,5 +8136,5 @@
 msgstr[2] "{0} trasy, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7878,10 +8144,10 @@
 msgstr[2] "{0} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Převést do datové vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7891,11 +8157,11 @@
 "<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7905,29 +8171,29 @@
 msgstr "Převedeno z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Stáhnout data z OSM podél této trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Stáhnout vše v rozmezí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Maximální plocha na požadavek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} čtverečních km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7938,13 +8204,9 @@
 "pokračovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7952,5 +8214,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7960,23 +8222,23 @@
 "byly vynechány."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "mimo stažený areál"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "verze {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7985,39 +8247,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Zavřít tento dialog a pokračovat v editování v JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} smazáno.)"
+msgstr[1] " ({0} smazáno.)"
+msgstr[2] " ({0} smazáno.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skládá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} smazáno.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "nenastaveno"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "Verze API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8187,6 +8469,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8201,6 +8481,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8370,5 +8648,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8702,21 +8980,20 @@
 msgstr "Jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Povolit vestavěné výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 msgid "Enable built-in icon defaults"
 msgstr "Povolit vestavěné standarní ikony"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+msgid "Used style"
+msgstr "Použitý styl"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
 msgid "Map Paint Styles"
 msgstr "Styly kreslení mapy"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
-msgid "Used style"
-msgstr "Použitý styl"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -8730,6 +9007,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Aktualizovat"
@@ -8814,9 +9090,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:86
 msgid "Projection code"
-msgstr ""
+msgstr "Kód projekce"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:89
 msgid "Bounds"
-msgstr ""
+msgstr "Hranice"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:94
@@ -8880,68 +9156,106 @@
 msgstr "Klávesová zkratka"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Aktivovat"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr "Cesty k ikonám"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Krátká popiska: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "Autor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Webová stránka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Verze: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr "Cesty k ikonám"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Zkopírovat výchozí hodnoty"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Vyberte řádek ke zkopírování."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr "Pridat do seznamu nový XML zdroj."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Smazat vybraný zdroj ze seznamu."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Přidat nový tag"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Zavřít vybrané otevřené sady změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Upravit zvolený zdroj."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Nahrávám historii pro uzel {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Nepodařilo se nahrát data na nebo stáhnout z<br>''{0}''<br>kvůli "
+"problémům s přenosem dat.<br>Detaily(nepřeloženo): {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, fuzzy, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr "Neplatná hodnota pro atribut ''{0}''. Nalezeno ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Setřídit nabídku s přednastaveními"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9124,5 +9438,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Více informací o tomto přednastavení"
@@ -9188,16 +9502,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Skupina přednastavení ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Skupina přednastavení ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9205,5 +9519,5 @@
 msgstr "Kontaktuji OSM server..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9314,5 +9628,5 @@
 msgstr "Parsování souboru \"{0}\" selhalo"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Chyba parsování: Chybná struktura GPX dokumentu"
@@ -9457,5 +9771,5 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
+msgstr "Úspěšně otevřená sada změn {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
@@ -9504,15 +9818,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:604
 msgid "Current changeset is null. Can't upload data."
-msgstr ""
+msgstr "Aktuální sada změn je prázdná. Nelze nahrávat data na server."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:606
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
-msgstr ""
+msgstr "ID aktuální sady změn musí být větší než 0. Aktuální ID je {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
-msgstr ""
+msgstr "Očekávána otevřená sada změn. Nalezena uzavřená sada změn s id {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -9544,5 +9858,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9556,24 +9870,24 @@
 #, java-format
 msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Neplatná hodnota pro atribut ''{0}''. Nalezeno ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
 #, java-format
 msgid "Illegal nummeric value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Neplatná číselná hodnota pro atribut ''{0}''. Nalezeno ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
 #, java-format
 msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr ""
+msgstr "Neplatná booleovská hodnota pro atribut ''{0}''. Nalezeno ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
-msgstr ""
+msgstr "Chybí povinný atribut ''{0}'' XML elementu {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9583,8 +9897,8 @@
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Aborting."
-msgstr ""
+msgstr "Nedefinovaný element ''{0}'' nalezen ve vstupních datech. Přerušuji."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9593,35 +9907,35 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
 msgid "Parsing list of changesets..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+msgstr "Načítám seznam sad změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Nesprávné heslo nebo uživatelské jméno"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Upozornění: heslo je posíláno nezašifrované."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Uložit uživatelské jméno a heslo (nezašifrované)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Zadejte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Přihlásit se"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Základní URL OSM serveru (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Přihlašovací jméno (e-mail) k účtu OSM."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9629,17 +9943,17 @@
 "Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo ukládat."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "URL serveru"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "Uživatelské jméno (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9711,4 +10025,5 @@
 "Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
 msgstr ""
+"Neplatná hodnota povinného atributu ''{0}'' typu double. Nalezeno ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:135
@@ -9721,5 +10036,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146
 msgid "<anonymous>"
-msgstr ""
+msgstr "<anonym>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:198
@@ -9745,5 +10060,5 @@
 msgstr "Soubor \"{0}\" neexistuje"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9751,20 +10066,22 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+"Chybějící povinné atributy prvku ''bounds''. Nalezeno minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Nalezen XML element <nd> jinde, než jako přímý potomek elementu <rway>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "Chybějící povinný atribut ''{0}'' na <nd> v cestě {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "Neplatná hodnota atributu ''ref'' elementu <nd>. Nalezeno {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
@@ -9772,20 +10089,20 @@
 "<relation>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Chybějící atribut ''ref'' na členu v relaci {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr "Neplatná hodnota atributu ''ref'' na členu v relaci {0}. Nalezeno {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Chybějící atribut ''type'' na členu {0} v relaci {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9794,19 +10111,19 @@
 "Neplatná hodnota atributu ''type'' na členu {0} v relaci {1}. Nalezeno {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletní <member> specifikace s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9815,7 +10132,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9825,25 +10146,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Neznámá, nebo nepodporovaná verze API. Nalezeno {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "Chybějící atribut ''version'' na OSM objektu s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "Chybějící povinný atribut ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9851,5 +10172,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9858,5 +10179,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9864,5 +10185,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9871,13 +10192,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Připravuji OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr "Zpracovávám OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr "Připravuji data..."
@@ -9888,14 +10209,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Stáhnout z OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr "Stahování odkazovaných cest ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr "Stahování odkazovaných relací ..."
@@ -9903,19 +10223,19 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
 msgid "Reading changesets..."
-msgstr ""
+msgstr "Načítám sady změn..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
 msgid "Downloading changesets ..."
-msgstr ""
+msgstr "Stahuji sady změn..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
 #, java-format
 msgid "Reading changeset {0} ..."
-msgstr ""
+msgstr "Načítám sadu změn {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
 #, java-format
 msgid "Downloading changeset {0} ..."
-msgstr ""
+msgstr "Stahuji sadu změn {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9939,5 +10259,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
 msgid "Error: failed to add authentication credentials to the connection."
-msgstr ""
+msgstr "Chyba: nepodařilo se přidat přihlašovací udaje do připojení."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
@@ -9950,5 +10270,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
 msgid "XML tag <user> is missing."
-msgstr ""
+msgstr "Chybí XML tag <user>."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
@@ -9958,5 +10278,5 @@
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
-msgstr ""
+msgstr "Chybějící atribut ''{0}'' na XML tagu ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
@@ -9967,4 +10287,5 @@
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+"Neplatná hodnota pro atribut ''{0}'' na XML tagu ''{1}''. Nalezeno {2}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:73
@@ -10008,15 +10329,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Aktualizuj pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Stáhnout pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10029,30 +10350,34 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "{0} Plugin byl úspěšně stažen. Prosím restartujte JOSM."
 msgstr[1] "{0} Pluginy byly úspěšně staženy. Prosím restartujte JOSM."
 msgstr[2] "{0} Pluginů bylo úspěšně staženo. Prosím restartujte JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Stahuji Plugin {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Přeskočit stahování"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Stáhnout Plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Přeskočit stahování"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10064,10 +10389,10 @@
 msgstr "Nastala chyba v pluginu {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10077,49 +10402,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Pluginy byly  naposledy aktualizovány před {0} dny."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Aktualizuj pluginy"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Plugin {0} požaduje aktualizaci JOSM na verzi {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Plugin {0} je požadován pluginem {1}, ale nebyl nalezen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Následující plugin nenalezen:{0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Pluginy byly  naposledy aktualizovány před {0} dny."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Počet dní, po kterých se zobrazí varování<br>můžete změnit pomocí "
-"'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Nemohu nahrát plugin {0}. Odstranit z nastavení?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Zakázat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Ponechat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10129,9 +10463,9 @@
 "jejich přepsání."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10140,10 +10474,10 @@
 "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Dle informací z pluginu je autor {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10151,9 +10485,9 @@
 "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Chcete plugin zakázat ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10163,22 +10497,22 @@
 "programu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr "Plugin nelze odstranit. Pravděpodobně je již neaktivní."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Informace o pluginu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "není zádný popis"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Více detailů"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10188,18 +10522,18 @@
 msgstr[2] "Informace o pluginech staženy z {0} sití"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Nenalezeny informace o pluginu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Plug-in {0} je nedostupný. Aktualizace přeskočena."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Všechny nainstalované pluginy jsou aktuální."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10212,9 +10546,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Stáhnout chybějící pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10229,9 +10563,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10253,19 +10587,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "neznámý"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Verze {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin zahrnut v JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10328,5 +10662,5 @@
 msgstr "(Text již byl zkopírován do schránky.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10335,5 +10669,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10342,5 +10676,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10350,5 +10684,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10361,10 +10695,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10373,5 +10707,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10380,16 +10714,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10399,5 +10733,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10408,5 +10742,5 @@
 "prověřte funkčnost internetového připojení.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10417,5 +10751,5 @@
 "problémům s přenosem dat.<br>Detaily(nepřeloženo): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10424,10 +10758,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10436,10 +10770,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10450,5 +10784,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10461,5 +10795,5 @@
 "vaše internetové připojení.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10470,5 +10804,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10570,11 +10904,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10639,5 +10966,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr ""
+msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
@@ -10651,5 +10978,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
 msgid "Tags (comma delimited)"
-msgstr ""
+msgstr "Tagy (oddělené čárkou)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146
@@ -10717,5 +11044,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -10727,14 +11055,14 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
 msgid "Define Address Interpolation"
-msgstr ""
+msgstr "Definovat interpolaci adres"
 
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Liché"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10742,105 +11070,105 @@
 msgstr "Sudé"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+msgstr "Abecedně"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+msgstr "Relace: {0}"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+msgstr "Přiřadit k ulici pomocí:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+msgstr "Číslovací systém:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+msgstr "Počáteční #:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+msgstr "Konečné #:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+msgstr "Město:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+msgstr "Stát:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+msgstr "PSČ:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+msgstr "Země:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+msgstr "Úplná Adresa:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+msgstr "Volitelné informace:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+msgstr "Prosíme, vyberte interpolaci adres pro tuto ulici"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+msgstr "Očekávána lichá čísla pro adresy"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+msgstr "Očekávána sudá čísla pro adresy"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+msgstr "Kód země musí mít 2 písmena"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+msgstr "Zadejte platné číslo pro počáteční a koncovou adresu"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+msgstr "Abecední adresy musí končit písmenem"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+msgstr "Počáteční a koncové číslo musí být pro abecední adresy stejné"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+msgstr "Počáteční písmeno musí být menší než koncové písmeno"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+msgstr "Zadejte platné číslo pro počáteční adresu"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
-msgstr ""
-
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+msgstr "Prosíme vložte platné číslo pro koncovou adresu"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
-msgstr ""
+msgstr "Počáteční číslo adresy musí být menší než koncové císlo"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
@@ -10892,46 +11220,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrahovat pozice GPS z EXIFu"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+msgstr "Začínam prohledávat adresář"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Jeden z vybraných souborů je prázdný!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Načíst fotografie..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemohu najít výchozí cesto pro adresář {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prohledávám adresář {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nalezen nulový soubor v adresáři {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba při získávání souborů z adresáře {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Korelovat vůči GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11192,5 +11521,5 @@
 msgstr "Chyba v souboru {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11203,10 +11532,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr "Vybrat Feuille"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11256,13 +11585,13 @@
 msgstr "Vyberte z..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Katastr"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Automatické zdrojování"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11271,13 +11600,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11390,7 +11719,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Zobrazovat souřadnice jako"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11409,5 +11737,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11450,13 +11778,13 @@
 msgstr "Vytvořit hranice"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr "Kontaktuji WMS katastru ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr "Obrázek je již načtený"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11572,5 +11900,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:32
 msgid "Set manually the Lambert zone"
-msgstr ""
+msgstr "Ručně nastavit Lambertovu zónu"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43
@@ -11589,24 +11917,24 @@
 #, java-format
 msgid "{0} not allowed with the current projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+msgstr "{0} není se současnou projekcí dovolena"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Změnit umístění"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Nastavení nového místa pro další požadavek"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Přidat novou vrstvu"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Umístění"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11616,5 +11944,5 @@
 "cadastre.gouv.fr .</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Přidat novou vrstvu"
@@ -11628,9 +11956,9 @@
 msgstr "Získat nový cookie (vypršení sezení)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+msgstr "PNG soubory (*.png)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr "Exportovat v PNG formátu (pouze rastrové obrázky)"
@@ -11651,9 +11979,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "Upravit pozici WMS vrstvy"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr "Upravit pozici WMS vrstvy (pouze rastrové obrázky)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11677,5 +12004,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Prázdná vrstva"
@@ -11704,5 +12031,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11713,9 +12040,9 @@
 "Vytvořte nový soubor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Chyba formátu cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11723,9 +12050,9 @@
 "Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Chyba Lambertovy zóny v cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11822,5 +12149,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Nebyla načtena žádná data."
@@ -12229,7 +12556,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "voda"
@@ -12442,32 +12769,32 @@
 msgstr "LiveGPS vrstva"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Nahrát GPS záznam"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Spoj se s gpsd serverem a ukaž aktuální pozici v LiveGPS vrstvě."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Vystředit jednou"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Vystředit vrstvu LiveGPS na současnou pozici."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Automaticky vystředit"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Udržovat vrstvu LiveGPS vystředěnou na současné pozici."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12556,26 +12883,26 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
-msgstr ""
-
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+msgstr "Vytvořit multipolygon"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
-msgstr ""
-
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+msgstr "Vytvořit multipolygon."
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
-msgstr ""
-
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+msgstr "Jedna z vybraných cest je již součástí jiného multipolygonu."
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
-msgstr ""
-
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+msgstr "Multipolygon se musí skládat pouze z uzavřených cest."
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
-msgstr ""
+msgstr "Musíte vybrat alespoň dvě cesty."
 
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
@@ -12729,4 +13056,9 @@
 msgstr "Spustitelný soubor Firefoxu"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Vrstva"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12775,30 +13107,30 @@
 msgstr "Povolené akce"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Dálkové ovládání bylo požádáno o nahrání dat z API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požadavku: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povolit?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Potvrdit akci dálkového ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Dálkové ovládání bylo požádáno o import dat z následujícího URL:"
@@ -12817,7 +13149,5 @@
 msgstr "Nevybrána žádná relace"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12826,4 +13156,5 @@
 #: ../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 "Navigace"
@@ -12845,25 +13176,25 @@
 msgstr "Otevřít seznam navigačních bodů"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
 msgstr "Přidat navigační vrstvu"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Kritérium"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "Nejkratší"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "Nejrychlejší"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Obrátit cestu"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Vymazat cestu"
@@ -12893,93 +13224,87 @@
 msgstr "Zadejte jednotky váhy"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Aktuální mapa"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Automatické přiblížení: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Nahrát dlaždici"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "Zobrazit stav dlaždice"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Vyžádat aktualizaci"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Zobrazit informace"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Nahrát všechny dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Zvětšit přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Zmenšit přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+msgstr "Vyprázdnit cache dlaždic"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "obrázek "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "automatické přiblížení"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "automaticky stahovat dlaždice"
 
 #. 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Nastavení pro plugin SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Zdroj dlaždic"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Automatické přiblížení: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Automaticky stahovat dlaždice: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Max. úroveň přiblížení: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Max. úroveň přiblížení: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Ztlumit pozadí: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "chyba při nahrávání metadat"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "požadováno: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "chyba při poždavku na aktualizaci"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -12992,5 +13317,5 @@
 msgstr "Uložit zachycená data do souboru každou minutu"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13156,5 +13481,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Jméno ulice"
@@ -13201,29 +13526,29 @@
 msgstr "Vyberte alespoň jednu uzavřenou cestu k připojení."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "Nenalezen žádný průnik. Nic se nemění."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Přidány body na všechny průsečíky"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Smazat cesty, které nejsou součástí vnižního multipolygonu."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Opravit relace."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Spojena plocha překrývající sama sebe"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Spojeny překrývající se plochy"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13233,33 +13558,33 @@
 "tímto nedošlo ke vzniku chyb."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Zadej hodnoty pro všechny konflikty"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Vyřešit konflikty"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Opravit konflikty značek"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Prvek odstraněn z relací"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Spojit plochy: Vymazat krátké cesty"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Uzavřená cesta"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Odstranit tagy z vnitřních cest"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Funkce spojení ploch"
@@ -13423,5 +13748,5 @@
 #, java-format
 msgid "Running test {0}"
-msgstr ""
+msgstr "Spouštím test {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
@@ -13441,9 +13766,9 @@
 #, java-format
 msgid "Test {0}/{1}: Starting {2}"
-msgstr ""
+msgstr "Test {0}/{1}: Spouští se {2}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
 msgid "Updating ignored errors ..."
-msgstr ""
+msgstr "Aktualizuji ignorované chyby ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
@@ -13467,8 +13792,4 @@
 msgstr "Opravit vybrané chyby"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignorovat"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13513,25 +13834,24 @@
 msgstr "Zaměňte \"{0}\" za \"{1}\" pro"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Linie pobřeží."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Tento test kontroluje správnost linií pobřeží."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
-msgstr "Neuspořádané pobřeží"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Neuspořádané pobřeží"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+msgid "Unconnceted coastline"
+msgstr "Nespojená pobřežní linie"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Neuspořádané pobřeží"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr "Obrácená pobřežní linie"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13553,18 +13873,18 @@
 msgstr "Zkřížené cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Duplicitní uzly"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Uzly na stejné pozici"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Potvrzení"
@@ -13601,5 +13921,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:35
 msgid "Missing name:* translation."
-msgstr ""
+msgstr "Chybějící překlad name:*."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
@@ -13612,9 +13932,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:46
 msgid "A name:* translation is missing."
-msgstr ""
+msgstr "Překlad name:* chybí."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:73
 msgid "A name is missing, even though name:* exists."
-msgstr ""
+msgstr "Chybí tag name, ačkoliv name:* existuje."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:24
@@ -13813,4 +14133,8 @@
 msgstr "Upravit zvolený zdroj."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Smazat vybraný zdroj ze seznamu."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14027,7 +14351,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "budova"
@@ -14041,5 +14365,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "oblast"
@@ -14049,25 +14373,25 @@
 msgstr "Neuzavřená cesta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Nespojené cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Tento test kontroluje na blízkost koncových uzlů cest k jiným cestám"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Koncový uzel cesty poblíž jiné silnice"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Koncový uzel cesty poblíž jiné cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Uzel cesty poblíž jiné cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Spojený koncový uzel cest poblíž jiné cesty"
@@ -14157,23 +14481,28 @@
 #, java-format
 msgid "Walking Papers: {0}"
-msgstr ""
-
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+msgstr "Walking Papers: {0}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS vrstva ({0}), stahování v přiblížení {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr ""
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr "Walking Papers"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "Vyberte počáteční bod na konci cesty"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "Dosažen konec cesty"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "Dosažena křižovatka"
@@ -14190,5 +14519,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:20
 msgid "Help / About"
-msgstr ""
+msgstr "Nápověda / O programu"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:27
@@ -14299,5 +14628,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
 msgid "Please select the WMS layer to adjust."
-msgstr ""
+msgstr "Prosíme vyberte WMS vrstvu k upravení."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
@@ -14307,13 +14636,13 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
 msgid "Start adjusting"
-msgstr ""
+msgstr "Začít upravování"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
 msgid "There are currently no WMS layer to adjust."
-msgstr ""
+msgstr "Nejsou žádné WMS vrstvy k upravování."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
 msgid "No layers to adjust"
-msgstr ""
+msgstr "Žádné vrstvy k upravování"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111
@@ -14333,5 +14662,5 @@
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
-msgstr ""
+msgstr "Upozornění: Úplné URL je ''{0}''."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134
@@ -14378,5 +14707,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
 msgid "Yes, fetch images"
-msgstr ""
+msgstr "Ano, stahovat obrázky"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
@@ -14431,9 +14760,9 @@
 msgstr "Chyba formátu souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu"
@@ -14483,13 +14812,13 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
 msgid "Overlap tiles"
-msgstr ""
+msgstr "Překryv dlaždic"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "% of east:"
-msgstr ""
+msgstr "% na východ:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
 msgid "% of north:"
-msgstr ""
+msgstr "% na sever:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -14668,4 +14997,6 @@
 "relation editor."
 msgstr ""
+"Vytváření multipolygonů jedním kliknutím, mnohem snadnější, než standardní "
+"cesta pomocí editoru relací."
 
 #. Plugin nearclick
@@ -14716,5 +15047,5 @@
 #: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
-msgstr ""
+msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
@@ -14793,4 +15124,6 @@
 "plugin is still under early development and may be buggy."
 msgstr ""
+"Podpora stahování rozčtvercovaných nascanovaných map z walking-papers.org. "
+"Tento plugin je stále v rané fázi vývoje a může obsahovat chyby."
 
 #. Plugin waydownloader
@@ -14865,5 +15198,5 @@
 #: build/trans_presets.java:68
 msgid "Highways"
-msgstr ""
+msgstr "Silnice"
 
 #. group "Highways"
@@ -14913,6 +15246,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Číslo"
@@ -15474,5 +15807,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr "kov"
@@ -15484,5 +15817,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "Prales"
@@ -15541,5 +15874,5 @@
 #: build/trans_presets.java:1320
 msgid "compacted"
-msgstr ""
+msgstr "zhutněná"
 
 #: build/trans_presets.java:254 build/trans_presets.java:272
@@ -15770,7 +16103,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "ano"
@@ -15919,8 +16252,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "ne"
@@ -16047,31 +16380,4 @@
 msgstr "Upravit křižovatku"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Typ"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16192,5 +16498,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "obytná oblast"
@@ -16225,5 +16531,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "obslužná cesta"
@@ -16258,5 +16564,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "konstrukce"
@@ -16646,12 +16952,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operátor"
@@ -16864,6 +17170,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Nadmořská výška"
@@ -17290,5 +17596,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "mokřina"
@@ -17740,5 +18046,5 @@
 msgctxt "aerialway"
 msgid "Station"
-msgstr ""
+msgstr "Stanice"
 
 #. item "Aerialway/Station"
@@ -17747,5 +18053,5 @@
 msgctxt "aerialway"
 msgid "Edit Station"
-msgstr ""
+msgstr "Upravit stanici"
 
 #. group "Car"
@@ -17821,25 +18127,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Otevírací doba"
@@ -17905,24 +18211,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr "24/7"
@@ -17935,26 +18241,26 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
-msgstr ""
+msgstr "Po-Pá 08:30-20:00"
 
 #: build/trans_presets.java:1397 build/trans_presets.java:1636
@@ -17965,26 +18271,26 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
+msgstr "Út-Ne 08:00-15:00; So 08:00-12:00"
 
 #. group "Bicycle"
@@ -18015,6 +18321,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Číslo záchodu"
@@ -18030,5 +18336,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "podzemní"
@@ -18036,5 +18342,5 @@
 #: build/trans_presets.java:1407
 msgid "Park and Ride"
-msgstr ""
+msgstr "Parkoviště P+R"
 
 #. item "Tourism/Information Terminal" text "Reference number"
@@ -18042,5 +18348,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Poplatek"
@@ -18158,5 +18464,5 @@
 msgctxt "railway"
 msgid "Station"
-msgstr ""
+msgstr "Stanice"
 
 #. item "Public Transport/Station"
@@ -18166,5 +18472,5 @@
 msgctxt "railway"
 msgid "Edit Station"
-msgstr ""
+msgstr "Upravit stanici"
 
 #. item "Public Transport/Station" text "Name"
@@ -18276,5 +18582,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Přístřešek"
@@ -18329,5 +18635,5 @@
 #: build/trans_presets.java:1578
 msgid "Travel"
-msgstr ""
+msgstr "Cestování"
 
 #. group "Travel"
@@ -18664,5 +18970,5 @@
 #: build/trans_presets.java:1735
 msgid "topo"
-msgstr ""
+msgstr "topografická"
 
 #. color tertiary
@@ -18706,5 +19012,5 @@
 #: build/trans_presets.java:1735
 msgid "scheme"
-msgstr ""
+msgstr "orientační"
 
 #: build/trans_presets.java:1736
@@ -18742,5 +19048,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -18755,5 +19061,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Lyžování"
@@ -18820,10 +19126,10 @@
 #: build/trans_presets.java:1780
 msgid "Audioguide"
-msgstr ""
+msgstr "Audioprůvodce"
 
 #. <space />
 #: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
-msgstr ""
+msgstr "Audioprůvodce přes mobilní telefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
@@ -18907,16 +19213,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Archeologické naleziště"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Upravit archeologické naleziště"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Památník"
@@ -18924,55 +19243,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Upravit kříž"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Boží muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Upravit boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
-msgstr ""
+msgstr "Hraniční kameny"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
-msgstr ""
+msgstr "Upravit hraniční kameny"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Upravit akvapark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Hřiště"
@@ -18980,35 +19299,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Sportovní potřeby"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -19022,6 +19341,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "vyberte sport:"
@@ -19413,30 +19732,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "sport"
@@ -19446,227 +19765,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "kombinovaný"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "lukostřelba"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australský fotbal"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "Hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kanoistika"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "Horolezení"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "cyklistika"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "závody psů"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "krasojízda"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "dostihy"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motoristické sporty"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota (míčová hra)"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "pálkové (raketové) sporty"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "střelba"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "bruslení"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "lyžování"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "plavání"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "stolní tenis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Kombinováné"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Upravit kombinované"
+
+#. 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 "typ"
 
 #. item "Sport/Multi" combo "type"
@@ -19703,203 +20075,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "hřiště"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "sportovní centrum"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadion"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Upravit bowling"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorové sporty"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Upravit motorové sporty"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
@@ -19907,56 +20279,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "Sjezdovka"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "Běžecká trať"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "pro začátečníky (zelená)"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "jednoduchá (modrá)"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "pro středně pokročilé (červená)"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "pro zkušené (černá)"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "pro experty (oranžová)"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "volný terén - freeride (žlutá)"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Střelba"
@@ -19964,182 +20336,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Upravit střelbu"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Fotbal"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Hry s koulemi (např. pétanque)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Upravit hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Upravit kriket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Ohražené místo pro tréning kriketu"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Upravit ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota (míčová hra)"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Upravit pelotu (míčová hra)"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Pálkové (raketové) sporty"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Upravit pálkové (raketové) sporty"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Upravit ragby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Budovy"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Budova"
@@ -20147,5 +20519,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -20153,10 +20525,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Upravit veřejnou budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Radnice"
@@ -20164,10 +20536,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Upravit radnici"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -20175,10 +20547,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Upravit ambasádu"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Soud"
@@ -20187,10 +20559,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Upravit soud"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Vězení"
@@ -20199,10 +20571,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Upravit vězení"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Policie"
@@ -20212,10 +20584,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Upravit policii"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -20224,10 +20596,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Upravit hasičskou stanici"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Pošta"
@@ -20235,5 +20607,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Upravit poštu"
@@ -20241,15 +20613,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Škola"
@@ -20257,10 +20629,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Upravit školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Vysoká škola"
@@ -20268,10 +20640,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Upravit vysokou školu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Střední škola"
@@ -20279,5 +20651,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Upravit střední školu"
@@ -20285,5 +20657,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kino"
@@ -20292,10 +20664,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Upravit kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Knihovna"
@@ -20304,9 +20676,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Upravit knihovnu"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Komunitní umělecké centrum"
@@ -20314,10 +20686,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Upravit komunitní umělecké centrum"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Divadlo"
@@ -20326,10 +20698,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Upravit divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Chrám(kostel, synagoga, mešita)"
@@ -20339,5 +20711,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Upravit chrám"
@@ -20346,6 +20718,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Náboženství"
@@ -20354,66 +20726,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahá'í"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "budhistické"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "křesťanské"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hindské"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "džinistické"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "židovské"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "muslimské"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
-msgstr ""
-
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+msgstr "sikh"
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "spiritualistické"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoistické"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "Unitářské"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastristické"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Vyznání"
@@ -20422,81 +20794,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglikánské"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptistické"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "katolické"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangelické"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "svědkové Jehovovi"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "luteránské"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "metodistické"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormonské"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "pravoslavné"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pentekostalistické"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbyteriánské"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestantské"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "kvakerské"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "ší'itské"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunnitské"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresy"
@@ -20505,5 +20877,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Upravit informace o adrese"
@@ -20511,5 +20883,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Číslo domu"
@@ -20517,20 +20889,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Jméno domu"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Jméno města"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Poštovní směrovací číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Kód země"
@@ -20539,5 +20911,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Upravit interpolaci adres"
@@ -20545,87 +20917,87 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Schéma číslování"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "liché"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "sudé"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "abecední"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Umělé konstrukce"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Továrna"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Věž"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
-msgstr ""
+msgstr "Typ věže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
-msgstr ""
-
-#: build/trans_presets.java:2308
+msgstr "telekomunikační"
+
+#: build/trans_presets.java:2314
 msgid "observation"
-msgstr ""
+msgstr "pozorovací"
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
-msgstr ""
+msgstr "Výška (metrů)"
 
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Maják"
@@ -20633,10 +21005,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -20644,10 +21016,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -20656,37 +21028,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Upravit potrubí"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+msgstr "ropa"
+
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
-msgstr ""
-
-#: build/trans_presets.java:2342
+msgstr "kanalizace"
+
+#: build/trans_presets.java:2348
 msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2342
+msgstr "teplo"
+
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
-msgstr ""
-
-#: build/trans_presets.java:2343
+msgstr "podvodní"
+
+#: build/trans_presets.java:2349
 msgid "overground"
-msgstr ""
-
-#: build/trans_presets.java:2345
+msgstr "nadzemní"
+
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -20696,10 +21068,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Jeřáb"
@@ -20707,10 +21079,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Upravit jeřáb"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Vodní bój"
@@ -20718,10 +21090,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Triangulační bod"
@@ -20729,10 +21101,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Upravit triangulační bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -20740,5 +21112,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Upravit sledovací kameru"
@@ -20746,5 +21118,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -20754,35 +21126,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "sluneční"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -20791,10 +21163,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -20803,5 +21175,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Upravit trafostanici"
@@ -20809,10 +21181,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Číslo vedení"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -20823,23 +21195,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Upravit stožár elektrického vedení"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
-msgstr ""
-
-#: build/trans_presets.java:2410
+msgstr "věž"
+
+#: build/trans_presets.java:2416
 msgid "pole"
-msgstr ""
-
-#: build/trans_presets.java:2411
+msgstr "stožár"
+
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Dráty elektrického vedení"
@@ -20848,75 +21220,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
-msgstr ""
+msgstr "Typ vedení"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
-msgstr ""
-
-#: build/trans_presets.java:2417
+msgstr "vedení"
+
+#: build/trans_presets.java:2423
 msgid "minor_line"
-msgstr ""
+msgstr "vedlejší vedení"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Napětí"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
-msgstr ""
+msgstr "Počet kabelů"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Number of wires (better: conductors) per power cable"
-msgstr ""
+msgstr "Počet drátů (nebo lépe vodičů) na každém kabelu"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "single"
-msgstr ""
-
-#: build/trans_presets.java:2422
+msgstr "jednoduchý"
+
+#: build/trans_presets.java:2428
 msgid "double"
-msgstr ""
-
-#: build/trans_presets.java:2422
+msgstr "dvojitý"
+
+#: build/trans_presets.java:2428
 msgid "triple"
-msgstr ""
-
-#: build/trans_presets.java:2422
+msgstr "trojitý"
+
+#: build/trans_presets.java:2428
 msgid "quad"
-msgstr ""
-
-#: build/trans_presets.java:2425
+msgstr "čtveřitý"
+
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Záchody"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefon"
@@ -20925,5 +21297,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Upravit telefon"
@@ -20931,5 +21303,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Mince"
@@ -20937,5 +21309,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Bankovky"
@@ -20943,5 +21315,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronické peněženky nebo kreditní karty."
@@ -20949,5 +21321,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Debetní karty"
@@ -20955,15 +21327,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Recyklační stanoviště"
@@ -20972,5 +21344,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Upravit recyklační stanoviště"
@@ -20978,35 +21350,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Oblečení"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Lavička"
@@ -21015,31 +21387,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
-msgstr ""
-
-#: build/trans_presets.java:2469
+msgstr "Opěrka zad"
+
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr "kámen"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr "Barva"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr "černá"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr "hnědá"
@@ -21110,40 +21482,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "zeleň"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "tráva"
-
-#: build/trans_presets.java:2470
+msgstr "šedá"
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr "bílá"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr "Počet sedadel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
@@ -21152,30 +21523,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "nízká"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "střední"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "plná"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Úkryt"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Uzamknutelný"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Fontána"
@@ -21184,10 +21555,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -21196,10 +21567,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Babybox"
@@ -21207,33 +21578,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Upravit babybox"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Upravit supermarket"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr "Upravit drogerii"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Samoobsluha, smíšenka, večerka"
@@ -21241,9 +21612,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Upravit večerku"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosek"
@@ -21251,27 +21622,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Upravit kiosek"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr "Knihkupectví"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr "Upravit knihkupectví"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "Cestovní kancelář"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "Upravit cestovní kancelář"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Prodejní automat"
@@ -21279,5 +21650,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Upravit prodejní automat"
@@ -21285,88 +21656,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Prodávané produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "lístky na městskou hromadnou dopravu"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "plány městské hromadné dopravy"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "parkovací lístky"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "jídlo"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "pití"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "krmivo pro zvířata"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "telefonní karty"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "poukazy"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "kondomy"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "Zůstatkové nebo věrnostní karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Řeznictví"
@@ -21374,9 +21745,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Upravit řeznictví"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Pekařství"
@@ -21384,9 +21755,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Upravit pekařství"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Květinářství"
@@ -21394,18 +21765,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Upravit květinářství"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Obchod se zdravou výživou"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Upravit obchod se zdravou výživou"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -21413,54 +21784,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Upravit obchod s alkoholem"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Upravit obchod s nápoji"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Počítače"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Upravit obchod s počítači"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Upravit obchod s elektronikou"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Upravit obchod s hifi"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Nábytek"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Upravit obchod s nábytkem"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Zahradnické centrum"
@@ -21468,9 +21839,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Upravit zahradnické centrum"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Železářství"
@@ -21478,9 +21849,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Upravit železářství"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Zboží pro kutily"
@@ -21488,54 +21859,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Upravit obchod se zbožím pro kutily"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Papírnictví"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Upravit papírnictví"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Kadeřnictví"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Upravit Kadeřnictví"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Obuv"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuví"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Hračky"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Upravit obchod s hračkami"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Videopůjčovna/prodejna"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Upravit videopůjčovnu/prodejnu"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Čistírna"
@@ -21543,9 +21914,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Upravit čistírnu"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Prádelna"
@@ -21553,9 +21924,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Upravit prádelnu"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Vybavení do přírody"
@@ -21563,28 +21934,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Obchod s vybavením do přírody"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Upravit obchod se sportovními pořebami"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Oční optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Upravit oční optiku"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Finance"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Banka"
@@ -21592,14 +21963,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Upravit banku"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Směnárna"
@@ -21607,5 +21978,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Upravit směnárnu"
@@ -21613,15 +21984,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Upravit bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Zdraví"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Středisko"
@@ -21629,18 +22000,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Upravit středisko"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Zubař"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Upravit zubařskou ordinaci"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Lékárna"
@@ -21648,5 +22019,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Upravit lékárnu"
@@ -21654,9 +22025,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Vydává léky na předpis"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Nemocnice"
@@ -21664,10 +22035,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Upravit nemocnici"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Místo pro kontaktování záchranářů"
@@ -21676,5 +22047,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Upravit místo pro kontaktování záchranářů"
@@ -21683,20 +22054,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Číslo místa"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Jméno místa"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Telefonní číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -21704,5 +22075,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -21711,59 +22082,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Upravit veterinární ordinaci"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Místa"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Upravit kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Stát"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Upravit stát"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Země"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Upravit zemi"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Kraj"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Upravit kraj"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Okres"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Upravit okres"
@@ -21771,15 +22147,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Velkoměsto"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Město"
@@ -21787,10 +22163,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Upravit město"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Městský obvod, nebo městská část"
@@ -21798,25 +22174,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Upravit městský obvod, nebo městská část"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Obec"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Upravit obci"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
@@ -21824,5 +22200,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Místní název"
@@ -21830,10 +22206,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Editovat místní název"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Ostrov"
@@ -21841,22 +22217,22 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Upravit ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
-msgstr ""
+msgstr "Ostrůvek"
 
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
-msgstr ""
+msgstr "Upravit ostrůvek"
 
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -21864,10 +22240,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Upravit vstup do jeskyně"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Vrchol"
@@ -21875,10 +22251,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Upravit vrchol"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Ledovec"
@@ -21886,10 +22262,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Upravit ledovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Sopka"
@@ -21897,70 +22273,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Upravit sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Národní"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Upravit národní hranici"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Administrativní"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Upravit administrativní hranici"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Volební obvod"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Upravit volební obvod"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Národní park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Upravit hranice národního parku"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Strom"
@@ -21969,15 +22345,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Upravit strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Botanické jméno"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Prales"
@@ -21986,5 +22362,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Editovat Prales"
@@ -21992,17 +22368,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "jehličnatý"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "smíšený"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Les"
@@ -22011,14 +22387,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Upravit lesní plochu"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Přírodní rezervace"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Upravit přírodní rezervaci"
@@ -22026,25 +22402,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Suťoviště"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Upravit suťoviště"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Podrost"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Upravit podrost"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Travnatá pahorkatina"
@@ -22052,10 +22428,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Upravit travnatou pahorkatinu"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Vřesoviště"
@@ -22063,5 +22439,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Upravit vřesoviště"
@@ -22069,5 +22445,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Farma"
@@ -22076,45 +22452,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Louka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
@@ -22122,25 +22498,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Zelená plocha"
@@ -22148,10 +22524,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Upravit zelenou plochu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "veřejná zeleň (mimo parky)"
@@ -22159,20 +22535,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Upravit veřejnou zeleň"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Rekreační plocha"
@@ -22180,5 +22556,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upravit rekreační plochu"
@@ -22186,15 +22562,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Obytná plocha"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Upravit obytnou plochu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Malý hřbitov"
@@ -22202,9 +22578,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Upravit malý hřbitov"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -22212,39 +22588,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Obchody"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Upravit plochu s obchody"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Kanceláře"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Upravit kancelářskou plochu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Železniční plocha"
@@ -22252,15 +22628,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Upravit železniční plochu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Vojenský prostor"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Upravit vojenský prostor"
@@ -22268,55 +22644,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Probíhající výstavba"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Upravit výstavbu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Stará zátěž, městské ruiny (Brownfield)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Upravit starou zátěž (Brownfield)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Upravit zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "skládka odpadu"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Upravit skládku odpadu"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -22326,5 +22702,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Upravit multipolygon"
@@ -22333,10 +22709,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "vnější část"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -22344,5 +22720,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -22351,5 +22727,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Upravit zákaz odbočení"
@@ -22357,34 +22733,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -22393,15 +22769,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "na cestu"
@@ -22409,5 +22785,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Trasa"
@@ -22416,5 +22792,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Upravit trasu"
@@ -22422,5 +22798,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Typ trasy"
@@ -22492,5 +22868,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22499,17 +22875,17 @@
 msgstr "bicykl"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "lyžařská"
@@ -22562,5 +22938,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22569,13 +22945,13 @@
 msgstr "pěší"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "turistická"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "objízdná"
@@ -22589,10 +22965,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Popis symbolu"
@@ -22600,31 +22976,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Síť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -22633,30 +23009,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "zpětná zastávka"
@@ -23094,11 +23470,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "zastaralý"
@@ -23563,5 +23939,5 @@
 #: build/trans_style.java:839
 msgid "services"
-msgstr ""
+msgstr "služby"
 
 #. color services
@@ -23644,5 +24020,5 @@
 #: build/trans_style.java:1031
 msgid "dock"
-msgstr ""
+msgstr "dok"
 
 #. color dock
@@ -24315,5 +24691,5 @@
 #: build/trans_style.java:1568
 msgid "power"
-msgstr ""
+msgstr "energetika"
 
 #. color manmade
@@ -24472,5 +24848,5 @@
 #: build/trans_style.java:1821
 msgid "leisure"
-msgstr ""
+msgstr "oddych (leisure)"
 
 #. color leisure
@@ -25122,5 +25498,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "menší vodní plochy"
@@ -25792,4 +26168,12 @@
 #.
 #. <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"/>
@@ -25814,5 +26198,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "historické"
@@ -25826,5 +26210,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "lom"
@@ -25838,5 +26222,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "skládka"
@@ -25858,5 +26242,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "nádrže"
@@ -25870,5 +26254,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "les"
@@ -25882,5 +26266,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "zemědělství"
@@ -25903,5 +26287,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "obchody"
@@ -25915,5 +26299,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "průmysl"
@@ -25927,5 +26311,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "stará zátěž, městské ruiny (Brownfield)"
@@ -25939,5 +26323,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "Zastavitelné území (Greenfield)"
@@ -25951,5 +26335,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "železniční plochy"
@@ -26006,7 +26390,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "vojenský"
@@ -26020,5 +26404,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "hřbitov"
@@ -26031,5 +26415,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "vrchol"
@@ -26044,5 +26428,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "ledovec"
@@ -26056,5 +26440,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "sopka"
@@ -26109,8 +26493,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "přírodní"
@@ -26124,5 +26508,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "křoví"
@@ -26136,5 +26520,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "vřesoviště"
@@ -26148,8 +26532,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "oblast"
+msgstr "zalesněné území"
 
 #. color water
@@ -26161,5 +26544,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "bahno"
@@ -26173,5 +26556,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "pláž"
@@ -26249,8 +26632,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "cesta"
@@ -26298,7 +26681,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "hranice"
@@ -26448,11 +26831,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "místo"
@@ -26500,6 +26883,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "adresa"
@@ -26807,103 +27190,164 @@
 msgstr "Český UHUL:ORTOFOTO"
 
+#~ msgid "File could not be found."
+#~ msgstr "Soubor nebyl nalezen"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Prosím zvol aspoň jeden úkol ke stažení"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Nahrándí do OSM API selhalo"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Konfliktní relace"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>Výběr \"{0}\" je použit v relaci \"{1}\" s rolí {2}.<br>Smazat z "
+#~ "relace?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Výběr \"{0}\" je použit v relaci \"{1}\".<br>Smazat z relace?</html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Chyba při parsování"
+
+#~ msgid "File not found"
+#~ msgstr "Soubor nebyl nalezen"
+
+#~ msgid "Replace"
+#~ msgstr "Nahradit"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Prosím zadejte nejdříve pozadovanou pozici"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Nejdříve zvolte záložku"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Prosím, zadejte hledaný řetězec"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Nemohu načíst výsledky hledání ze serveru"
+
+#~ msgid "name"
+#~ msgstr "jméno"
+
+#~ msgid "zoom"
+#~ msgstr "Zvětšení"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Zkopírovat výchozí hodnoty"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Vyberte řádek ke zkopírování."
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory."
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Pridat do seznamu nový XML zdroj."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Počet dní, po kterých se zobrazí varování<br>můžete změnit pomocí "
+#~ "'pluginmanager.warntime'.)"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Zobrazit stav dlaždice"
+
+#~ msgid "Request Update"
+#~ msgstr "Vyžádat aktualizaci"
+
+#~ msgid "error loading metadata"
+#~ msgstr "chyba při nahrávání metadat"
+
+#~ msgid "requested: {0}"
+#~ msgstr "požadováno: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "chyba při poždavku na aktualizaci"
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "No data imported."
+#~ msgstr "Nic nebylo importováno"
+
+#~ msgid "Data Layer"
+#~ msgstr "Vrstva dat"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM Online Nápověda"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Otevřít v prohlížeči"
+
+#~ msgid "unnamed"
+#~ msgstr "nepojmenováno"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Neznámá přípona souboru."
+
+#~ msgid "Change"
+#~ msgstr "Změnit"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Smazat {1} {0}"
+
+#~ msgid "Rotate"
+#~ msgstr "Otočit"
+
+#~ msgid "Move"
+#~ msgstr "Přesunout"
+
+#~ msgid "false"
+#~ msgstr "nepravda"
+
+#~ msgid "true"
+#~ msgstr "pravda"
+
+#~ msgid "different"
+#~ msgstr "různé"
+
+#~ msgid "position"
+#~ msgstr "pozice"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "their version:"
+#~ msgstr "verze na serveru:"
+
+#~ msgid "resolved version:"
+#~ msgstr "finální verze:"
+
+#~ msgid "my version:"
+#~ msgstr "moje verze:"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Revert"
+#~ msgstr "Vrátit zpět"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Neuložené změny"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
+
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Chyba při načítání stránky {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">češtině</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">angličtině</A> "
-#~ "anebo <A HREF=\"{1}\">ve vašem jazyce</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Nápovědu můžete upravovat pouze z online nápovědy JOSM"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Použít přednastavení \"{0}\""
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Nejdříve otevřete vrstvu (GPX, OSM, cache)"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "No data imported."
-#~ msgstr "Nic nebylo importováno"
-
-#~ msgid "Data Layer"
-#~ msgstr "Vrstva dat"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online Nápověda"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Otevřít v prohlížeči"
-
-#~ msgid "unnamed"
-#~ msgstr "nepojmenováno"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Neznámá přípona souboru."
-
-#~ msgid "Change"
-#~ msgstr "Změnit"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Smazat {1} {0}"
-
-#~ msgid "Rotate"
-#~ msgstr "Otočit"
-
-#~ msgid "Move"
-#~ msgstr "Přesunout"
-
-#~ msgid "false"
-#~ msgstr "nepravda"
-
-#~ msgid "true"
-#~ msgstr "pravda"
-
-#~ msgid "different"
-#~ msgstr "různé"
-
-#~ msgid "position"
-#~ msgstr "pozice"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "their version:"
-#~ msgstr "verze na serveru:"
-
-#~ msgid "resolved version:"
-#~ msgstr "finální verze:"
-
-#~ msgid "my version:"
-#~ msgstr "moje verze:"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Revert"
-#~ msgstr "Vrátit zpět"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Neuložené změny"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
 
 #~ msgid "Cannot connect to server."
@@ -26939,6 +27383,6 @@
 #~ msgstr "Neznámá verze"
 
-#~ msgid "Aborting..."
-#~ msgstr "Přerušuji..."
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Nápovědu můžete upravovat pouze z online nápovědy JOSM"
 
 #~ msgid "YAHOO (WebKit)"
@@ -27093,4 +27537,10 @@
 #~ msgstr "Poslat komentář"
 
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Použít přednastavení \"{0}\""
+
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
 #~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování"
@@ -27153,4 +27603,7 @@
 #~ msgstr "Přidat všechny zvolené objekty mezi prvky"
 
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr "Nastavit Lambertovu zónu ručně (např. pro místo mezi dvěmi zónami)"
+
 #~ msgid ""
 #~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
@@ -27166,4 +27619,7 @@
 #~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před "
 #~ "nahráním na server."
+
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Nejdříve otevřete vrstvu (GPX, OSM, cache)"
 
 #~ msgid "Selected makes your trace public in openstreetmap.org"
@@ -27503,7 +27959,4 @@
 #~ msgstr "Uzavřít aktuální sadu změn"
 
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Aktuálně není otevřena žádná sada změn."
-
 #~ msgid "Use a new changeset and close it"
 #~ msgstr "Použít novou sadu změn a uzavřít ji"
@@ -27514,4 +27967,14 @@
 #~ msgid "Missing mandatory attribute ''{0}''"
 #~ msgstr "Chybějící povinný atribut ''{0}''"
+
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">češtině</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">angličtině</A> "
+#~ "anebo <A HREF=\"{1}\">ve vašem jazyce</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 18273)
+++ applications/editors/josm/i18n/po/da.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-21 12:10+0000\n"
-"Last-Translator: Peter Brodersen <Unknown>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-25 13:39+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Skaber hovedgrænsefladen"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorerer defekt URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Advarsel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorerer defekt fil-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Kunne ikke læse filen \"{0}\".<br> Fejlen er: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Fejl"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "UKENDT"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Om"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Vis \"Om\"-billedet."
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Seneste ændring ved {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java-version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Fejlrapporter"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Information"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Læsmig"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Version"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Bidrag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licens"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Om JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Filen kunne ikke findes."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -318,42 +301,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -361,5 +343,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -372,19 +354,19 @@
 msgstr "Vælg venligst et allerede uploadet punkt, vej eller relation."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Sammenflet"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -395,50 +377,50 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Tilføj punkt..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Tilføj punkt ved at indtaste bredde og længde."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Ret: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Indtast koordinater for nyt punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Brug decimaltal i grader."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negative værdier angiver vestlig/sydlig halvkugle."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -447,5 +429,5 @@
 msgstr "Breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -454,27 +436,27 @@
 msgstr "Længdegrad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Opstil punkter i cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Flyt de valgte punkter ind i en cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -484,5 +466,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -498,30 +480,28 @@
 msgstr "Værktøj: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Vælg mindst fire punkter."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -531,84 +511,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Stil punkter op på linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Flyt de valgte punkter på linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Vælg venligst mindst tre punkter."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "valgt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "hent"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom til {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom synsfeltet til {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Vis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Intet valgt at  zoome ind på."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Ingen konflikter at zoome ind på."
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Luk åbne rettesæt"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Lukker åbne rettesæt"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -616,37 +596,37 @@
 msgstr "Fil: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Der er ingen åbne rettesæt"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Ingen åbne rettesæt"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Henter åbne rettesæt ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Sammensæt vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Sammensæt adskillige veje til én"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Skift retninger?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Vend om og sammensæt"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -656,5 +636,5 @@
 "nogle af dem om?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -664,41 +644,41 @@
 "af punkter)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sammensæt {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Vælg mindst to veje at sammensætte."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopier valgte objekter til udklipsholderen."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Vælg venligst noget at kopiere."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Opret cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Opret cirkel ud fra tre valgte punkter."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Punkterne er ikke i en cirkel. Afbryder."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -708,16 +688,14 @@
 "tre punkter."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -729,5 +707,5 @@
 msgstr "Fjern"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Slet valgte objekter."
@@ -735,6 +713,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -748,73 +726,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Fordel punkter"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Fordel de valgte punkter med samme afstand langs en linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Hent fra OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Hent kort-data fra OSM serveren."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Hent"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Vælg mindst én opgave til download"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Hent primitiver, der refererer til en af de valgte primitiver."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -823,39 +778,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Der var {0} konflikter under import."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Konflikt ved download"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Henter forældre til primitivet {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Henter forældre til primitivet {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Henter forældre til primitivet {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplikér"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplikér det valgte ved kopiering og indsættelse."
@@ -865,41 +820,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Afslut"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Afslut programmet."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Alle formater"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Eksporter til GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Eksporter dataet til GPS-fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Intet at eksportere. Hent først noget data."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -938,6 +893,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -956,9 +911,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -978,5 +933,5 @@
 msgstr "parameteren \"{0}\" må ikke være en null-værdi"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -984,36 +939,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Eksportér GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
 msgstr "Objektets historik"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Vis historik for veje, punkter eller relationer i OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Information om element"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Vis objekt-informationer om punkter, veje eller relationer i OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Føj punkt til vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Forbind et punkt til nærmeste stykke vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Forbind punkt og linje"
@@ -1023,170 +978,188 @@
 msgstr "Ingen genvej"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Sammenflet lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Flet det nuværende lag sammen med et andet lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Foren punkter"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Foren punkter til den ældste."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Vælg mindst to punkter, der skal forenes."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Afbryder..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Kan ikke forene punkter: Ville være nødt til at slette en vej, som stadigvæk "
 "er i brug."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Foren {0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Sammenflet det valgte"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Sammenflet de aktuelt valgte primitiver til et nyt lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Afspejl"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Afspejl de valgte punkter og veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Vælg mindst ét punkt eller vej."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "op"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Flyt objekterne {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "ned"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "venstre"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "højre"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Flyt {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Flytter objekterne {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Kan ikke flytte objekter ud af verden."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Ny"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Opret et nyt kort."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Åbn..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Åbn en fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Åbner filer"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Åbner filen \"{0}\" ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Åbn placering..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Åbn en URL."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Separat lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr "Vælg om data skal downloades til et nyt lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Indtast URL, der skal hentes:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Hent lokalitet"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Hent URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr "Påbegynd download af data"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "Luk dialog og fortryd download"
 
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Henter data"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Gør vinkler rette"
@@ -1196,18 +1169,18 @@
 msgstr "Flyt punkter så alle vinkler er 90 eller 270 grader"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1216,9 +1189,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1227,36 +1200,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Gør vinkler rette"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Sæt ind"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Indsæt indhold af udklipsholderen."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Indsæt tags"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Tilføj tags i udklipsholderen til alle valgte elementer."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1265,5 +1239,5 @@
 msgstr[1] "Indsætter {0} tags"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1272,59 +1246,59 @@
 msgstr[1] "til {0} primitiver"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Indstillinger..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Åbn en side for globale indstillinger."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Omgør"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Omgør seneste fortrydelse"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Omdøb lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Omdøb også filen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Kunne ikke omdøbe filen \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Vend veje om"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Vend retningen for alle valgte veje."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Vælg mindst én vej."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Vend veje om"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1332,10 +1306,10 @@
 msgstr "Gem"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Gem nuværende data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1386,21 +1360,21 @@
 msgstr "Gem lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Gem som..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Gem det nuværende data i en ny fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Vælg alt"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1410,28 +1384,28 @@
 "objekter."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Vis statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr "Vis statusrapport med brugbare informationer, der kan tilknyttes fejl."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Hjælp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Kopier til udklipsholder og luk"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1440,18 +1414,18 @@
 msgstr "Luk"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Opdel vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Opdel en vej ved det valgte punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Det nuværende valgte kan ikke bruges til opdeling"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1459,5 +1433,5 @@
 msgstr[1] "De valgte punkter er ikke i midten af nogen vej."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1471,9 +1445,9 @@
 "Der er mere end én vej, som bruger de punkter, du har valgt. Vælg også vejen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "De valgte punkter deler ikke samme vej."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1481,10 +1455,10 @@
 msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Du skal vælge mindst to punkter for at opdele en kredsformig vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1511,60 +1485,60 @@
 msgstr "Opdel vejen {0} i {1} stykker"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Skift visning af GPX-linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Tegn linjer mellem rå GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Skifter den globale indstilling \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Adskil veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Dublet-punkter, som bruges af flere veje."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Dette punkt er ikke forbundet til noget andet."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Ingen af disse punkter er fastklistret til noget andet."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ingen af denne vejs punkter er forbundet til noget andet."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Vælg enten:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Et markeret punkt, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Et punkt, som bruges af mere end én vej, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Et punkt, som bruges af mere end én vej en af disse veje, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1573,5 +1547,5 @@
 "eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1580,5 +1554,5 @@
 "vej."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1588,9 +1562,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1598,80 +1572,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Kopier {0} punkter ind i {1} punkter"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Fortryd"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Fortryd den sidste handling"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Fravælg alt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Fravælg alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Fravælg alt (fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Fravælg alt (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Tegn omridset af data hentet fra serveren."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Opdater det valgte"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Der er ingen valgte primitiver at opdatere."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Intet er valgt"
@@ -1683,8 +1658,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1693,5 +1668,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1699,29 +1674,29 @@
 msgstr "Ingen ændringer at sende."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Intet at sende. Skab først noget data."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Synkronisér hele datasættet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1735,11 +1710,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1750,5 +1725,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1758,23 +1733,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Modstridende relation"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1785,28 +1759,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Upload til OSM-API'et fejlede"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Opdaterer primitiv"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1815,17 +1780,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Ret {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1844,11 +1823,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Zoom ind"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Zoom ud"
@@ -1928,21 +1907,17 @@
 msgstr "Langsommere fremad"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Henter GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Hent GPX-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Rå GPS-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Henter data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1950,27 +1925,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Henter {0} af {1} ({2} tilbage)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Fejl ved download"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Brugerens navn."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignorér"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Klik for at fjerne destination"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1982,7 +1969,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Slettede eller flyttede primitiver"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Følgende fejl opstod under den samlede download:"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Fejl ved download"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Fejl ved download"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2004,5 +2006,5 @@
 msgstr "Tilstand: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2032,38 +2034,38 @@
 msgstr "valgt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 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:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Opret nyt punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Vælg punkt under markøren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2072,14 +2074,14 @@
 msgstr[1] "Indsæt nyt punkt i {0} veje."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "Start ny vej fra seneste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Fortsæt vej fra seneste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Afslut tegning."
@@ -2099,5 +2101,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slip museknappen for at vælge objekterne inden i firkanten."
@@ -2108,5 +2110,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Slip museknappen for at stoppe rotationen."
@@ -2166,5 +2168,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2173,5 +2175,5 @@
 "nærmeste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2184,4 +2186,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Forstør"
@@ -2199,5 +2202,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Søg..."
@@ -2296,43 +2298,49 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alle ændrede objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alle valgte objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alle ufuldstændige objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 "Brug <b>|</b> eller <b>OR</b> to for at forbinde med et logisk \"eller\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Brug <b>\"</b> for at angive operatorer (fx hvis key indeholder : )"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Brug <b>(</b> og <b>)</b> for at gruppere udtryk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2342,51 +2350,51 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Søg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Start søgning"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Intet resultat for \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Intet tilføjet til det valgte ved søgning efter \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Intet fjernet fra det valgte ved søgning efter \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Fandt {0} resultater"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "Versalfølsom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "Ikke-versalfølsom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "Regulært udtryk"
@@ -2418,26 +2426,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Mangler argumenter for \"eller\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Mangler argument fro \"ikke\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Forventede slutparentes."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2446,5 +2465,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2542,4 +2561,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2557,8 +2592,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Ret {0} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2639,5 +2674,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2673,4 +2708,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parameteren \"{0}\" må ikke være en null-værdi"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2701,29 +2747,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Modstridende relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Slet fra relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Opdel vejstykke"
@@ -2731,6 +2754,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2742,5 +2765,5 @@
 "måske bruger dem.<br>Vil du virkelig slette?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2926,15 +2949,30 @@
 msgstr "Automatisk tag-rettelse"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Standardværdien er \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Fejl i konfigurationsfilen ved linjerne {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2943,5 +2981,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2950,5 +2988,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2957,5 +2995,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2964,5 +3002,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2970,5 +3008,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2977,5 +3015,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2984,5 +3022,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2991,5 +3029,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2998,19 +3036,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Indstillinger er gemt på {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kunne ikke sende indstillinger. Årsag: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Kunne ikke hente indstillinger fra serveren."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3019,5 +3080,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "UKENDT"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3039,20 +3120,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "V"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "Ø"
@@ -3063,4 +3144,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3128,14 +3223,14 @@
 msgstr "Advarsel: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3143,5 +3238,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3168,6 +3263,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3227,113 +3322,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "En vej af typen Område er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "multipolygon-vej \"{0}\" er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Slettede medlem \"{0}\" i relation"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vej \"{0}\" med mindre end to punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Mere end én \"fra\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Mere end én \"til\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Mere end én \"via\" blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukendt rolle \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukendt medlemstype for \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Ingen \"fra\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Ingen \"til\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Intet \"via\"-punkt eller vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Indre vej \"{0}\" er på ydersiden."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Ikke-vej \"{0}\" i multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ingen ydre vej for multipolygon \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Indre vej \"{0}\" er på ydersiden."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3349,11 +3444,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "tekst"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3369,5 +3463,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3378,5 +3471,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3405,5 +3497,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "baggrund"
@@ -3432,12 +3524,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambert-zone (Frankrig)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambert-zone (Frankrig)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3473,10 +3563,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3505,5 +3595,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "jernbane"
@@ -3520,4 +3610,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3533,33 +3625,33 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3567,16 +3659,16 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Ukendt vært"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3589,4 +3681,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Henter \"Dagens besked\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Klik for at fjerne destination"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3657,74 +3754,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Brugernavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Kodeord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "brug"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "valgmuligheder"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Vis denne hjælp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Hent det omsluttende område"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Hent lokaliteten fra URL'en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Åbn fil (som rå GPS, hvis .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Hent det omsluttende område som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Start op i maksimeret tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Nulstil indstillingerne til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Vælg sprog."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3733,9 +3830,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3743,25 +3840,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "I stedet for --download=<bbox> kan du angive osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Aktiverer opdaterede udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Henter indledende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Sætter standardværdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Henter udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3774,11 +3871,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3803,6 +3900,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3903,25 +4000,22 @@
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "lag er ikke i listen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Fejl ved fortolkning"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Filen blev ikke fundet"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Nej, fortryd handlingen"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3943,5 +4037,5 @@
 msgstr "uangivet: sæt ikke denne egenskab for de valgte objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3970,24 +4064,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Ret {0} objekt"
-msgstr[1] "Ret {0} objekter"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Slet valgte objekter."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "ikke slettet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -3999,5 +4090,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4046,5 +4137,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4061,5 +4152,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4259,8 +4350,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4569,6 +4660,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4582,6 +4673,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4639,36 +4730,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4680,5 +4771,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "alle"
@@ -4768,4 +4859,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4776,4 +4869,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4787,49 +4881,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "Behold mine"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Indtast værdier for alle konflikter."
+
+#: ../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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4866,6 +4994,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4954,10 +5082,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5024,5 +5149,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5067,4 +5193,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5090,6 +5217,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5098,22 +5225,22 @@
 msgstr[1] "Dette vil ændre på op til {0} objekter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "En tom værdi vil slette nøglen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<forskellige>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Ret værdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5122,69 +5249,73 @@
 msgstr[1] "Ret egenskaber for op til {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Vælg venligst en nøgle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Vælg venligst en værdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Vælg de objekter, du vil rette egenskaber for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Egenskaber/medlemsskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Egenskaber for valgte objekter."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Medlem af"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Tilføj egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Rediger egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaber: {0} / Medlemskaber: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Egenskaber / Medlemskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Skift relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Slet fra relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Slet virkelig det valgte fra relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøgle i alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Fjern egenskaber"
@@ -5192,40 +5323,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Åbn en liste over alle relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Åbn en editor for den valgte relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Slet de nvalgte relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Opret en ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Slet de nvalgte relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Vælg enten:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Slet de nvalgte relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Hent medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5252,5 +5403,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5262,14 +5413,14 @@
 msgstr "Valgt: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Frigør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik for at minimere/maksimere panelet"
@@ -5351,5 +5502,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5379,23 +5531,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5404,14 +5556,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5421,9 +5573,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5433,15 +5585,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5449,5 +5601,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5455,20 +5607,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5477,66 +5629,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Flyt det nuværende valgte medlem op"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Flyt det nuværende valgte medlem ned"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5545,9 +5697,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5556,41 +5708,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hent alle ufuldstændige veje og punkter der er forbundet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Hent medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5600,17 +5752,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5621,13 +5773,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5641,14 +5793,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5698,58 +5850,89 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Ikke forbundet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Bogmærker"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Indtast venligst først de ønskede koordinater."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#, fuzzy
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "Der er ingen rettesæt åbne."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Opret områder"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Flyt det nuværende valgte medlem ned"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Indtast et navn for stedet."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Vælg først et bogmærke"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Flyt det nuværende valgte medlem op"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Flyt det nuværende valgte medlem op"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min. bredde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min. længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "maks. bredde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "maks. længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5759,26 +5942,78 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Omkransende område"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Datakilder og typer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap-data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Opdel en vej ved det valgte punkt"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Rå GPS-data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Den valgte vej indeholder ikke det valgte punkt."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Hent som nyt lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Hent område"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Hent"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Intet valgt GPX-spor"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Området er for stort; vil sandsynligvis blive afvist af serveren"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5786,331 +6021,59 @@
 "serveren"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Luk dialog og fortryd download"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Flyt det nuværende valgte medlem op"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Vælg venligst rækken, der skal rettes."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Indtast et stednavn at søge efter:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Indtast et stednavn at søge efter:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 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:168
-msgid "Please enter a search string"
-msgstr "Indtast venligst en søgestreng"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Kan ikke læse sted søgnings resultat fra serveren"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Indtast et stednavn at søge efter:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Steder"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "navn"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "type"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "nær"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Flytbart kort"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "Zoom-niveau"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x fra"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "til"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y fra"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Tern-nummer"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Søg..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+msgid "Click to start searching for places"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6468,4 +6431,6 @@
 #. 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" />
@@ -6846,6 +6811,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6911,11 +6877,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6925,6 +6891,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6934,79 +6900,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Navn"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Type"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "nær"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Flytbart kort"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "Zoom-niveau"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x fra"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "til"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y fra"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Tern-nummer"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Bruger"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7087,4 +7320,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7376,9 +7610,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ændrede objekter:"
+msgstr[1] "Ændrede objekter:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7474,5 +7708,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7502,59 +7745,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Billeder for {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Indlæs GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Intet tidspunkt for punkt {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Kan ikke læse tidspunkt \"{0}\" for punkt {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Indlæser {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Ingen billeder med læsbare tidsstempler fundet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Indlæser {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Geotaggede billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS-start: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS-slut: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "nuværende forskel: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "tidszone-forskel: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7562,51 +7805,51 @@
 msgstr[1] "billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} inden for sporet."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Synkronisér ur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-billeder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Datoen i filen \"{0}\" kunne ikke forstås."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Billede"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Indtast den viste dato (mm/dd/åååå TT:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "GPS-enhedens tidszone (forskel fra foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synkronisér tidspunkt med GPS-enhed"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Den indtastede tid kunne ikke forstås."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7614,30 +7857,30 @@
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Tilpas linjetegning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Brug globale indstillinger."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter for dette lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Tegn ikke linjer mellem punkter for dette lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Vælg linjetegnings-indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7645,5 +7888,5 @@
 msgstr "Tilpas farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7652,5 +7895,5 @@
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7659,43 +7902,43 @@
 msgstr "Vælg en farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Markører fra navngivne punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Navngivne punkter fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importér lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importér billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Navn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7705,28 +7948,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Længde: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7735,5 +7978,5 @@
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7742,10 +7985,10 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Konvertér til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7755,11 +7998,11 @@
 "<br>Hvis du vil uploade traces, så kig her:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7769,29 +8012,29 @@
 msgstr "Konverteret fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Hent fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Hent alt inden for:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7802,14 +8045,10 @@
 "du<br>at fortsætte?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 "Ingen GPX-spor er tilgængelige i laget, som der kan associeres lyd med."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7817,5 +8056,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7823,23 +8062,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "uden for det hentede område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7848,39 +8087,56 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Luk dialog og fortryd download"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} slettet.)"
+msgstr[1] " ({0} slettet.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består af:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} slettet.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "API-version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8047,6 +8303,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8061,6 +8315,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8230,5 +8482,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8563,20 +8815,19 @@
 msgstr "Sprog"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Brug indbyggede standarder"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8591,6 +8842,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Opdater"
@@ -8743,68 +8993,102 @@
 msgstr "Genvej"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Vælg venligst rækken, som skal kopieres."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
 msgstr "Slet den valgte kilde fra listen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Ret værdien for den valgte nøgle for alle objekter"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Tilføj en kommentar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Genopfrisk listen til udvælgelse."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Ret den valgte kilde."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8992,5 +9276,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Mere information om denne feature"
@@ -9055,16 +9339,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Forudindstillet gruppe \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Forudindstillet gruppe \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9072,5 +9356,5 @@
 msgstr "Kontakter OSM-serveren..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9181,5 +9465,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument"
@@ -9405,5 +9689,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9430,5 +9714,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9436,5 +9720,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9447,5 +9731,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9456,33 +9740,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Forkert brugernavn eller kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advarsel: Kodeordet sendes ukrypteret."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Gem brugernavn og kodeord (ukrypteret)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Indtast kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Basis URLen for OSM serveren (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Login-navn (e-mail) til OSM-kontoen."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9491,17 +9775,17 @@
 "kodeord."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Grundlæggende URL til server"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "OSM-brugernavn (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM-kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9598,5 +9882,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9605,38 +9889,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9644,19 +9928,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ufuldstændig <member>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Ugyldigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9665,7 +9949,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9675,25 +9963,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9701,5 +9989,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9708,5 +9996,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9714,5 +10002,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9721,13 +10009,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Forbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9738,14 +10026,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Hent fra OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9857,15 +10144,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Opdater udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Hent udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9878,29 +10165,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "{0} udvidelse blev succesfuldt hentet ned. Genstart venligst JOSM."
 msgstr[1] "{0} udvidelser blev succesfuldt hentet ned. Genstart venligst JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Henter udvidelsen {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Hent udvidelse"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9912,10 +10203,10 @@
 msgstr "En fejl opstod i udvidelsen {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9925,49 +10216,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Seneste udvidelsesopdatering mere end {0} dage siden."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Opdater udvidelser"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Udvidelsen {0} kræver at JOSM skal opdateres til version {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Udvidelsen {0} kræves af udvidelsen {1}, men blev ikke fundet."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Udvidelsen blev ikke fundet: {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Seneste udvidelsesopdatering mere end {0} dage siden."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Du kan rette antallet af dage mellem denne advarsel vises<br>ved at rette i "
-"indstillingen 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Kunne ikke indlæse udvidelsen {0}. Fjern fra indstillinger?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Deaktivér udvidelse."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Behold udvidelse"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9977,9 +10277,9 @@
 "til at overskrive de eksisterende udvidelser."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9987,10 +10287,10 @@
 msgstr "En uventet fejl opstod, som kan stamme fra \"{0}\"-udvidelsen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Ifølge udvidelsen medfølgende information, så er {0} forfatteren."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9999,9 +10299,9 @@
 "fejlrapport."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Skal udvidelsen deaktiveres?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10011,22 +10311,22 @@
 "udvidelsen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "Ingen beskrivelse er tilgængelig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Flere detaljer"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10035,18 +10335,18 @@
 msgstr[1] "Hent udvidelsesinformationer fra {0} sites"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Ingen udvidelsesinformationer blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Alle installerede udvidelser er opdaterede."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10059,9 +10359,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Hent manglende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10076,9 +10376,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10100,19 +10400,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "ukendt"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Udvidelse som følger med JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10177,5 +10477,5 @@
 msgstr "(teksten er allerede kopieret til til din udklipsholder.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10184,5 +10484,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10191,5 +10491,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10199,5 +10499,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10207,10 +10507,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10219,5 +10519,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10226,16 +10526,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10245,5 +10545,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10252,5 +10552,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10259,5 +10559,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10266,10 +10566,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10278,10 +10578,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10292,5 +10592,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10300,5 +10600,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10309,5 +10609,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10410,11 +10710,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10557,5 +10850,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -10571,10 +10865,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Ulige"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10582,103 +10876,103 @@
 msgstr "Lige"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10732,46 +11026,47 @@
 "{0} km/t"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Trækker GPS-lokaliteter ud fra EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
+msgstr "Flyt det valgte lag en række op."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Indlæs billeder..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kan ikke hente den kanoniske sti for mappen {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tjekker mappen {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fandt en null-fil i mappen {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fejl ved hentning af filer fra mappen {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Sammenhold med GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11033,5 +11328,5 @@
 msgstr "Fejl i fil {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11044,10 +11339,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11095,13 +11390,13 @@
 msgstr "Vælg fra..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11110,13 +11405,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11226,7 +11521,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Vis koordinater som"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11245,5 +11539,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11284,13 +11578,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11421,22 +11715,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Skift lokalitet"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11444,5 +11738,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11456,9 +11750,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11478,9 +11772,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "Tilpas positionen for WMS-laget"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11502,5 +11795,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Tomt lag"
@@ -11529,5 +11822,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11536,18 +11829,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11642,5 +11935,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Intet data indlæst."
@@ -12046,7 +12339,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "vand"
@@ -12248,32 +12541,32 @@
 msgstr "LiveGPS-lag"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Forbind til gpsd-server og vis nuværende position i LiveGPS-lag"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centrér LiveGPS-laget til nuværende position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Auto-centrér"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centrér LiveGPS-laget løbende til den nuværende position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12362,24 +12655,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12527,4 +12820,9 @@
 msgstr "Firefox-programfil"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Lag"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12570,30 +12868,30 @@
 msgstr "Tilladte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Anmod om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Vil du tillade dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Bekræft Fjernbetjenings-handling"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12612,7 +12910,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12621,4 +12917,5 @@
 #: ../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 "Ruteplan"
@@ -12640,25 +12937,25 @@
 msgstr "Åbn en liste af punkter i ruteplanen"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
 msgstr "Tilføj ruteplan-lag"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Kriterier"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "Korteste"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "Hurtigste"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Vend ruten om"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Fjern rute"
@@ -12688,93 +12985,87 @@
 msgstr "Indtast vægtede værdier"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Autozoom: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Hent tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
 msgstr "Vis status for tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Anmod om opdatering"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Hent alle tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Øg zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Reducer zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Kilder til tern"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Autozoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Hent tern automatisk: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Maks. zoomniveau: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Maks. zoomniveau: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Nedton baggrund: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "fejl ved indlæsning af metaoplysninger"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "anmodet: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "fejl ved anmodning af opdatering"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -12787,5 +13078,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12947,5 +13238,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Vejnavn"
@@ -12989,29 +13280,29 @@
 msgstr "Vælg mindst en lukket vej, som skal forbindes."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Tilføjede punkter ved alle kryds"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Slet veje, som ikke er en del af en indre multipolygon"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Ret relationer"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Sammenlagde selv-overlappende område"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Sammensatte overlappende områder"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13019,33 +13310,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Indtast værdier for alle konflikter."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Løs konflikter"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Fjernede element fra relationer"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Sammenlæg områder: Fjern korte veje"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Lukket vej"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Fjern tags fra indre veje"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Funktion til sammenlægning af områder"
@@ -13253,8 +13544,4 @@
 msgstr "Ret de valgte fejl."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignorér"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13299,24 +13586,23 @@
 msgstr "Erstat \"{0}\" med \"{1}\" for"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Kystlinjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Denne test tjekker om kystlinjerne er korrekte."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Uforbundne veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "Vend ruten om"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13339,10 +13625,10 @@
 msgstr "Krydsende veje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Dublet-punkter"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
@@ -13350,9 +13636,9 @@
 "sted."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13600,4 +13886,8 @@
 msgstr "Ret den valgte kilde."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Slet den valgte kilde fra listen."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13812,7 +14102,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "bygning"
@@ -13826,5 +14116,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "område"
@@ -13834,26 +14124,26 @@
 msgstr "Uafsluttet vej"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Uforbundne veje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Denne test undersøger om en vej har et slutpunkt meget tæt på en anden vej."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Vejens slutpunkt tæt på anden landevej."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Vejens slutpunkt nær anden vej."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Vejpunkt tæt på anden vej"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Forbundet vejs slutpunkt tæt på anden vej"
@@ -13945,21 +14235,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS-lag ({0}), henter til zoom {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14194,9 +14489,9 @@
 msgstr "Fil format fejl"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Åbn et tomt WMS-lag for at hente data fra en fil"
@@ -14659,6 +14954,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Reference"
@@ -15220,5 +15515,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15230,5 +15525,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "træ"
@@ -15516,7 +15811,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "ja"
@@ -15665,8 +15960,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "nej"
@@ -15793,31 +16088,4 @@
 msgstr "Ret trafikknudepunkt"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Type"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15938,5 +16206,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "beboelse"
@@ -15971,5 +16239,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr ""
@@ -16004,5 +16272,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr ""
@@ -16392,12 +16660,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Selskab"
@@ -16610,6 +16878,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Højde"
@@ -17036,5 +17304,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr ""
@@ -17567,25 +17835,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Åbningstider"
@@ -17651,24 +17919,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17681,24 +17949,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17711,24 +17979,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17761,6 +18029,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr ""
@@ -17776,5 +18044,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
@@ -17788,5 +18056,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Gebyr"
@@ -18022,5 +18290,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr ""
@@ -18488,5 +18756,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cykling"
@@ -18501,5 +18769,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skisport"
@@ -18653,16 +18921,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Arkæologisk sted"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Ret arkæologisk sted"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Ret monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Mindesmærke"
@@ -18670,55 +18951,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Ret mindesmærke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Rekreation"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Badeland"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Ret badeland"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Legeplads"
@@ -18726,35 +19007,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Ret legeplads"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fiskeri"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Ret fiskeri"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sportsfaciliteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Ret stadion"
@@ -18768,6 +19049,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "vælg sportsgren:"
@@ -19159,30 +19440,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "sport"
@@ -19192,227 +19473,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "bueskydning"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australsk fodbold"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "petanque"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "hundeløb"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "travbane"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "skydebane"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "skisport"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "fodbold"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "svømning"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Idrætscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Ret idrætscenter"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Ret golfbane"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Ret minigolf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Ret multi"
+
+#. 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 "type"
 
 #. item "Sport/Multi" combo "type"
@@ -19449,203 +19783,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "bane"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadion"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Ret bowling"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Ret atletik"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Bueskydning"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Ret bueskydning"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Ret klatring"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Redigér cykling"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Hundeløb"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Ret hundeløb"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Ret ridning"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Galopbane"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Ret galopbane"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Ret gymnastik"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Ret motorsport"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Ret skating"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Ret Skateboard"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Svømning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Ret svømning"
@@ -19653,56 +19987,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Ret skisport"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Sværhedsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "nybegynder"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "let"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "avanceret"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Skydning"
@@ -19710,182 +20044,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Ret skydning"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sport (bold)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fodbold"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Ret fodbold"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerikansk fodbold"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Ret amerikansk fodbold"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Ret australsk fodbold"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Ret Baseball"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Ret Basketball"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Ret Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "Golfbane"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Petanque"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Ret petanque"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Ret cricket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricketnet"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Ret cricketnet"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Ret kroket"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Ret hockey"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Ret pelota"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Ret rugby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Ret bordtennis"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Ret tennis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Bygning"
@@ -19893,5 +20227,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -19899,10 +20233,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Ret offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Rådhus"
@@ -19910,10 +20244,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Ret rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambassade"
@@ -19921,10 +20255,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Ret ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Domhus"
@@ -19933,10 +20267,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Ret domhus"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Fængsel"
@@ -19945,10 +20279,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Ret fængsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Politi"
@@ -19958,10 +20292,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Ret politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -19970,10 +20304,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Ret brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Posthus"
@@ -19981,5 +20315,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Ret posthus"
@@ -19987,15 +20321,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Ret børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Skole"
@@ -20003,10 +20337,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Ret skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universitet"
@@ -20014,10 +20348,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Ret universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr ""
@@ -20025,5 +20359,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr ""
@@ -20031,5 +20365,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Biograf"
@@ -20038,10 +20372,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Ret biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliotek"
@@ -20050,9 +20384,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Ret bibliotek"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Kunstcenter"
@@ -20060,10 +20394,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Redigér kunstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teater"
@@ -20072,10 +20406,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Ret teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Sted for tilbedelse"
@@ -20085,5 +20419,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Ret sted for tilbedelse"
@@ -20092,6 +20426,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religion"
@@ -20100,66 +20434,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "buddhistisk"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hinduistisk"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "jainistisk"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "muslimsk"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "spiritistisk"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoistisk"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "unitar"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastristisk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Trosretning"
@@ -20168,81 +20502,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptistisk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "Jehovas Vidner"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "metodistisk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormonsk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pinsebevægelsen"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "prebyteriansk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestantisk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "kvæker"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "shiitisk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunnitisk"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresser"
@@ -20251,5 +20585,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Ret adresseinformation"
@@ -20257,5 +20591,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Husnummer"
@@ -20263,20 +20597,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Bynavn"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Landekode"
@@ -20285,5 +20619,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Ret adresse-interpolering"
@@ -20291,61 +20625,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Nummereringssystem"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "ulige"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "lige"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Menneskeskabt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Ret fabrik"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Ret tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20353,25 +20687,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vandtårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Ret vandtårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Ret gasbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -20379,10 +20713,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Ret fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Vejrmølle"
@@ -20390,10 +20724,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Ret vejrmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -20402,37 +20736,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Ret rørledning"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Rensningsanlæg"
@@ -20442,10 +20776,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Ret rensningsanlæg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Kran"
@@ -20453,10 +20787,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Ret kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Pejlemærke"
@@ -20464,10 +20798,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Ret Pejlemærke"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -20475,10 +20809,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Overvågning"
@@ -20486,5 +20820,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Ret overvågningskamera"
@@ -20492,5 +20826,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Generator"
@@ -20500,35 +20834,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Ret generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "vand"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "arom"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "kul"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "sol"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Kraftværk"
@@ -20537,10 +20871,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Ret kraftværk"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -20549,5 +20883,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Ret transformatorstation"
@@ -20555,10 +20889,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Elmast"
@@ -20569,23 +20903,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Ret elmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Strømkabel"
@@ -20594,75 +20928,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Ret strømkabel"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Spænding"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Faciliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Toiletter"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefon"
@@ -20671,5 +21005,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Ret telefon"
@@ -20677,5 +21011,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Mønter"
@@ -20683,5 +21017,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Sedler"
@@ -20689,5 +21023,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20695,5 +21029,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr ""
@@ -20701,15 +21035,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Genbrug"
@@ -20718,5 +21052,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Ret genbrugsplads"
@@ -20724,35 +21058,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Dåser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Tøj"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Skrotjern"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Bænk"
@@ -20761,31 +21095,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20856,40 +21190,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "græs"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Skydetelt"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Ret skydetelt"
@@ -20898,30 +21231,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Højde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "fuld"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Springvand"
@@ -20930,10 +21263,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Ret springvand"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Vandpost"
@@ -20942,10 +21275,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Ret vandpost"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Babyluge"
@@ -20953,33 +21286,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Ret babyluge"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Ret supermarked"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Købmand"
@@ -20987,9 +21320,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Ret købmand"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -20997,27 +21330,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Ret kiosk"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Automat"
@@ -21025,5 +21358,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Ret automat"
@@ -21031,88 +21364,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Varer i automat"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "P-automat"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "mad"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "billeder"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "dyremad"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "legetøj"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "frimærker"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tamponer"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "høm-høm-pose"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Slagter"
@@ -21120,9 +21453,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Ret slagter"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Bager"
@@ -21130,9 +21463,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Ret bager"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Blomsterhandler"
@@ -21140,18 +21473,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Ret blomsterhandler"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Sprit"
@@ -21159,54 +21492,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Redigér spritbutik"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Drikkevarer"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Redigér drikkevarebutik"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Ret computerforretning"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Elektronik"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Ret elektronikforretning"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hi-fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Ret hi-fi-forhandler"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Møbelforretning"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Ret møbelforretning"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Havecenter"
@@ -21214,9 +21547,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Redigér havecenter"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21224,9 +21557,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Gør-det-selv-butik"
@@ -21234,54 +21567,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Ret gør-det-selv-butik"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Ret frisør"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Sko"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Ret skobutik"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Legetøjsbutik"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Redigér legetøjsbutik"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Redigér videobutik"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Kemisk renseri"
@@ -21289,9 +21622,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Ret kemisk renseri"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -21299,9 +21632,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Ret vaskeri"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr ""
@@ -21309,28 +21642,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Ret sportsbutik"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Ret optiker"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Penge"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Bank"
@@ -21338,14 +21671,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Ret bank"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Pengeautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Vekselkontor"
@@ -21353,5 +21686,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Ret vekselkontor"
@@ -21359,15 +21692,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Ret pengeautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Sundhed"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Lægehus"
@@ -21375,18 +21708,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Ret lægehus"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Tandlæge"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Ret tandlæge"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -21394,5 +21727,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Ret apotek"
@@ -21400,9 +21733,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Håndkøb"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Hospital"
@@ -21410,10 +21743,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Ret Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr ""
@@ -21422,5 +21755,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -21429,20 +21762,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(brug forvalgskode, fx +12-345-67890)"
@@ -21450,5 +21783,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -21457,59 +21790,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Ret dyrlæge"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Steder"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Ret et kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Ret land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Stat"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Ret stat"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Ret region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Amt"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Ret amt"
@@ -21517,15 +21855,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "By"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Ret by"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Mindre by"
@@ -21533,10 +21871,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Ret mindre by"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Forstad"
@@ -21544,25 +21882,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Ret forstad"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "By"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Ret by"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Landsby"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Ret landsby"
@@ -21570,5 +21908,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Egn"
@@ -21576,10 +21914,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Ret lokalitet"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Ø"
@@ -21587,10 +21925,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Ret ø"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21598,5 +21936,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21604,5 +21942,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Huleindgang"
@@ -21610,10 +21948,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Ret huleindgang"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Tinde"
@@ -21621,10 +21959,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Ret tinde"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -21632,10 +21970,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Ret gletsjer"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Vulkan"
@@ -21643,70 +21981,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Ret vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Grænser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Ret landegrænser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Administrativt"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Ret administrativ grænse"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Ret civil-grænse"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Ret politisk grænse"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Ret grænser for nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Brug af land"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Træ"
@@ -21715,15 +22053,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Ret et træ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Skov"
@@ -21732,5 +22070,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Ret skov"
@@ -21738,17 +22076,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "Nåleskov"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "Løvskov"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "blandet"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Skov"
@@ -21757,14 +22095,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Ret skovområde"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Ret naturreservat"
@@ -21772,25 +22110,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Ur"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Ret ur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Krat"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Ret krat"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Højdedrag"
@@ -21798,10 +22136,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Ret højdedrag"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Hede"
@@ -21809,5 +22147,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Ret hede"
@@ -21815,5 +22153,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Gårdsplads"
@@ -21822,45 +22160,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Ret gårdsplads"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Ret vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Kolonihaver"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Ret kolonihave-område"
@@ -21868,25 +22206,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Have"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Ret have"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Græs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21894,10 +22232,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr ""
@@ -21905,20 +22243,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Ret park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Rekreativt område"
@@ -21926,5 +22264,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Ret rekreativt område"
@@ -21932,15 +22270,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Beboelseområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Kirkegård"
@@ -21948,9 +22286,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -21958,39 +22296,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Detailhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Ret område for detailhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Industri"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Ret industri-område"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr ""
@@ -21998,15 +22336,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Militært område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Ret militært område"
@@ -22014,55 +22352,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Byggeplads"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Ret område for byggeplads"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Stenbrud"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Ret stenbrudsområde"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -22072,5 +22410,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Ret multipolygon"
@@ -22079,10 +22417,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "ydre segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "indre segment"
@@ -22090,5 +22428,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr ""
@@ -22097,5 +22435,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -22103,34 +22441,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr ""
@@ -22139,15 +22477,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr ""
@@ -22155,5 +22493,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Rute"
@@ -22162,5 +22500,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Ret rute"
@@ -22168,5 +22506,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22238,5 +22576,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22245,17 +22583,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "vej"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "færge"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "ski"
@@ -22308,5 +22646,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22315,13 +22653,13 @@
 msgstr "fod"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "vandre"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "omvej"
@@ -22335,10 +22673,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "undergrundsbane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Symbol beskrivelse"
@@ -22346,31 +22684,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Netværk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "foreslået"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Farve (hex)"
@@ -22379,30 +22717,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "rute-segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22840,11 +23178,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr ""
@@ -24868,5 +25206,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25538,4 +25876,12 @@
 #.
 #. <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"/>
@@ -25560,5 +25906,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "historisk"
@@ -25572,5 +25918,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "stenbrud"
@@ -25584,5 +25930,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr ""
@@ -25604,5 +25950,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr ""
@@ -25616,5 +25962,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "skov"
@@ -25628,5 +25974,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr ""
@@ -25649,5 +25995,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr ""
@@ -25661,5 +26007,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "industri"
@@ -25673,5 +26019,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25685,5 +26031,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25697,5 +26043,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25752,7 +26098,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "militær"
@@ -25766,5 +26112,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "kirkegård"
@@ -25777,5 +26123,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr ""
@@ -25790,5 +26136,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "gletsjer"
@@ -25802,5 +26148,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "vulkan"
@@ -25855,8 +26201,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr ""
@@ -25870,5 +26216,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "buskads"
@@ -25882,5 +26228,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "hede"
@@ -25894,8 +26240,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "område"
+msgstr ""
 
 #. color water
@@ -25907,5 +26252,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr ""
@@ -25919,5 +26264,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "strand"
@@ -25995,8 +26340,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr ""
@@ -26044,7 +26389,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "grænse"
@@ -26194,11 +26539,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "sted"
@@ -26246,6 +26591,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "adresse"
@@ -26553,25 +26898,61 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Fejl ved indlæsning af siden {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a>"
+#~ msgid "File could not be found."
+#~ msgstr "Filen kunne ikke findes."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Vælg mindst én opgave til download"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Upload til OSM-API'et fejlede"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Modstridende relation"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Fejl ved fortolkning"
+
+#~ msgid "File not found"
+#~ msgstr "Filen blev ikke fundet"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Indtast venligst først de ønskede koordinater."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Vælg først et bogmærke"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Indtast venligst en søgestreng"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Kan ikke læse sted søgnings resultat fra serveren"
+
+#~ msgid "name"
+#~ msgstr "navn"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Vælg venligst rækken, som skal kopieres."
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a> eller <a "
-#~ "href=\"{1}\">dit sprog</a>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Kan kun redigere hjælpesider fra JOSM Online-hjælp"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Brug forudindstilling \"{0}\""
+#~ "(Du kan rette antallet af dage mellem denne advarsel vises<br>ved at "
+#~ "rette i indstillingen 'pluginmanager.warntime'.)"
+
+#~ msgid "Request Update"
+#~ msgstr "Anmod om opdatering"
+
+#~ msgid "error loading metadata"
+#~ msgstr "fejl ved indlæsning af metaoplysninger"
+
+#~ msgid "requested: {0}"
+#~ msgstr "anmodet: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "fejl ved anmodning af opdatering"
 
 #~ msgid "Move"
@@ -26604,7 +26985,4 @@
 #~ msgstr "<nd> har nul ref"
 
-#~ msgid "Aborting..."
-#~ msgstr "Afbryder..."
-
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
 #~ msgstr "Overførsel er afbrudt grundet en fejl (venter i fem sekunder)"
@@ -26707,4 +27085,10 @@
 #~ msgstr "EPSG:4326"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Kan kun redigere hjælpesider fra JOSM Online-hjælp"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Fejl ved indlæsning af siden {0}"
+
 #~ msgid "Open in Browser"
 #~ msgstr "Åbn i browser"
@@ -26759,9 +27143,12 @@
 #~ msgstr "Ugemte ændringer"
 
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Brug forudindstilling \"{0}\""
+
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "Tryk Genindlæs for at genopfriske listen"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Genopfrisk listen til udvælgelse."
 
 #~ msgid "Found <member> element in non-relation."
@@ -26968,7 +27355,4 @@
 #~ "Vælg mindst ét punkt, vej eller relation. Kun allerede uploadede "
 #~ "elementer har en historik."
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Følgende fejl opstod under den samlede download:"
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -27100,7 +27484,4 @@
 #~ msgstr "Gendanner relation..."
 
-#~ msgid "Keep mine"
-#~ msgstr "Behold mine"
-
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Tjekker om primitiven {0} er væk ..."
@@ -27166,6 +27547,13 @@
 #~ "Der er ugemte ændringer i {0} lag. Smid ændringerne væk og fortsæt?"
 
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Der er ingen rettesæt åbne."
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a>"
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Hjælpesiden mangler. Opret den på <a href=\"{0}\">engelsk</a> eller <a "
+#~ "href=\"{1}\">dit sprog</a>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 18273)
+++ applications/editors/josm/i18n/po/de.po	(revision 18508)
@@ -9,6 +9,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-25 13:17+0100\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-08 14:50+0100\n"
 "Last-Translator: Dirk Stöcker <openstreetmap@dstoecker.de>\n"
 "Language-Team: Deutsch\n"
@@ -17,67 +17,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:04+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Hauptfenster erzeugen"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoriere die ungültige URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -90,12 +90,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -105,14 +99,14 @@
 msgstr "Warnung"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoriere die ungültige Datei-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
@@ -121,13 +115,12 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -135,23 +128,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -159,5 +153,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -166,21 +160,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -189,5 +184,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -200,17 +195,9 @@
 msgstr "Fehler"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "UNBEKANNT"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Über"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Über dieses Programm"
@@ -218,37 +205,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "OpenStreetMap-Editor in Java"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Letzte Änderung am {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java-Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Webseite"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Fehler melden"
@@ -258,5 +245,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -264,33 +251,29 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Bitte lesen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Version"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Mitwirkende"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Lizenz"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Über JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Datei wurde nicht gefunden."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -328,42 +311,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -371,5 +353,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -384,19 +366,19 @@
 "oder Relation) auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Bitte die Zielebene auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Zielebene auswählen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Vereinen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -407,50 +389,50 @@
 "werden könnte.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Keine Zielebenen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Knotenpunkt hinzufügen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Knoten durch Eingabe von Länge und Breite hinzufügen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Bearbeiten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Koordinaten des neuen Knotens eingeben."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Verwenden Sie Angaben in Dezimalgrad."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negative Werte für die westliche oder südliche Hemisphere."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -459,5 +441,5 @@
 msgstr "Breitengrad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -466,27 +448,27 @@
 msgstr "Längengrad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Knotenpunkte im Kreis anordnen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Gewählte Punkte in einem Kreis anordnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -496,5 +478,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -510,30 +492,28 @@
 msgstr "Werkzeug: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Bitte mindestens vier Knotenpunkte auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -543,84 +523,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Knotenpunkte in einer Linie anordnen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Gewählte Punkte so verschieben, dass sie in einer Linie liegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Bitte mindestens drei Knotenpunkte auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "Ebene"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "heruntergeladene Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Auf {0} zoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Ansicht auf {0} zoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Anzeige: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Nichts ausgewählt, auf das gezoomt werden kann."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Keine Konflikte, auf die gezoomt werden kann."
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Offene Änderungssätze schließen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Schließt offene Änderungssätze"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -628,37 +608,37 @@
 msgstr "Datei: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Es existieren keine offenen Änderungssätze"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Keine offenen Änderungssätze"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Offene Änderungssätze herunterladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Weg verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Mehrere Wege zu einem verbinden."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Richtungen ändern?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Drehen und Verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -668,5 +648,5 @@
 "Möchten Sie, dass einige Richtungen gedreht werden?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -676,41 +656,41 @@
 "Reihenfolge gebracht werden)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} Wege verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopie"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Gewählte Objekte in die Zwischenablage kopieren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Bitte etwas zum Kopieren auswählen."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Kreis erstellen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Einen Kreis aus drei ausgewählten Knoten erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Diese Knoten sind nicht in einem Kreis angeordnet. Abbruch."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -720,16 +700,14 @@
 "exakt 2 oder 3 Knoten ausgewählt werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -741,5 +719,5 @@
 msgstr "Entfernen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Ausgewählte Objekte löschen."
@@ -747,6 +725,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -760,73 +738,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Knoten verteilen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Gewählte Punkte gleichmäßig auf einer Linie verteilen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Von OSM-Server herunterladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Kartendaten vom OSM-Server laden."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Daten herunterladen"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Bitte wählen Sie mindestens eine Aufgabe zum Herunterladen"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr "Elternrelationen, -wege herunterladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Objekte mit Verweis zu einem der ausgewählten Objekte herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
 #, java-format
 msgid "Id > 0 required, got {0}"
 msgstr "ID > 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -835,39 +790,39 @@
 msgstr "Parameter ''{0}'' darf nicht null sein"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Es traten {0} Konflikte während des Imports auf."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Konflikte beim Herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr "({0}/{1}) Eltern des Knotens {2} laden"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr "({0}/{1}) Eltern des Wegs {2} laden"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr "({0}/{1}) Eltern der Relation {2} laden"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplizieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Auswahl durch Kopieren und sofortiges Einfügen duplizieren."
@@ -877,41 +832,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Beenden"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Programm beenden"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Alle Formate"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Als GPX exportieren..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Die Daten ins GPX-Format exportieren."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nichts zu exportieren. Erzeugen Sie zuerst ein paar Daten."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -950,6 +905,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -968,9 +923,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -990,5 +945,5 @@
 msgstr "Parameter \"{0}\" darf nicht NULL sein"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -996,36 +951,36 @@
 msgstr "Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "GPX-Datei exportieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
 msgstr "Objektgeschichte"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Versionsprotokoll der Wege, Knoten oder Relationen anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Elementinformation"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Informationen über  Wege, Knoten oder Relationen anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Knotenpunkt in den Weg einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Einen Knotenpunkt an der nächsten Stelle in den Weg einfügen."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Knotenpunkt und Linie vereinigen"
@@ -1035,170 +990,185 @@
 msgstr "Kein Tastenkürzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Ebene vereinigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Aktuelle Ebene mit einer anderen zusammenführen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Knotenpunkte vereinigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Mehrere Knotenpunkte zum ältesten vereinigen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Bitte mindestens zwei Knotenpunkte zum Vereinigen wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+msgid "Abort Merging"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Kann Knotenpunkte nicht vereinigen: Ein Weg, der noch verwendet wird, müsste "
 "gelöscht werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "{0} Knotenpunkte vereinigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Auswahl vereinigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Ausgewählte Objekte mit einer anderen Ebene verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Spiegeln"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Gewählte Knotenpunkte und Wege spiegeln."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Bitte mindestens einen Weg oder Knoten wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "hoch"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Objekte {0} verschieben"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "runter"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "links"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "rechts"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "{0} verschieben"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Verschiebt Objekte {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Neu"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Eine neue Karte erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Öffnen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Datei öffnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Dateien öffnen"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Datei \"{0}\" öffnen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Adresse öffnen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Eine URL öffnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Separate Ebene"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+msgstr "Auswählen, ob die Daten in eine neue Ebene geladen werden sollen"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "URL zum Herunterladen eingeben"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+msgstr "Bitte geben Sie eine URL ein, von der Daten geladen werden sollen"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Adresse herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "URL herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+msgstr "Herunterladen der Daten starten"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
-msgstr ""
+msgstr "Fenster schließen und Herunterladen abbrechen"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+msgid "Download Data"
+msgstr "Daten herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Form rechtwinklig machen"
@@ -1208,18 +1178,18 @@
 msgstr "Knoten so verschieben, dass alle Winkel 90 oder 270 Grad sind"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr "Form rechtwinklig anordnen / Rückgängig"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+msgstr "Rechtwinklige Anordnung ausgewählter Knoten rückgängig machen"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+msgstr "Rechtwinklig anordnen / Rückgängig machen"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1227,10 +1197,13 @@
 "action!"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+"Rechtwinklig anordnen / Rückgängig machen\n"
+"Bitte wählen Sie die Knoten aus, die zuvor bei rechtwinkligen Anordnung "
+"verschoben wurden."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+msgstr "Rechtwinklige Anordnung rückgängig machen"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1242,36 +1215,37 @@
 "Projektion zum Ausschalten dieser Warnung.<br>Wollen Sie fortfahren?</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr "Verwendung"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+msgstr "Die ausgewählten Objekte können nicht rechtwinklig angeordnet werden"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Rechtwinklig machen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Inhalt der Zwischenablage einfügen."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Merkmale einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Merkmale aus der Zwischenablage allen ausgewählten Elementen zuweisen."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1280,5 +1254,5 @@
 msgstr[1] "{0} Merkmale einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1287,59 +1261,59 @@
 msgstr[1] "zu {0} Objekten"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Einstellungen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Seite für allgemeine Einstellungen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Letzte Änderung wiederherstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Ebene umbenennen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Die Datei auch umbenennen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Die Datei ''{0}'' konnte nicht umbenannt werden"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Richtung der Wege drehen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Die Richtung aller gewählter Wege umdrehen."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Bitte mindestens einen Weg wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Richtung des Weges drehen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1347,10 +1321,10 @@
 msgstr "Speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Aktuelle Daten speichern."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1401,21 +1375,21 @@
 msgstr "Ebene speichern"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Aktuelle Daten in einer neuen Datei speichern."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Alles auswählen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1425,28 +1399,28 @@
 "unvöllständige Objekte ausgewählt."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Statusübersicht anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr "Statusübersicht mit nützlichen Informationen für Fehlerberichte anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Hilfe: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Statusbericht"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "In die Zwischenablage kopieren und schließen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1455,18 +1429,18 @@
 msgstr "Schließen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Weg aufspalten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Weg am gewählten Knotenpunkt aufspalten."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Die aktuelle Auswahl kann nicht zum Aufspalten verwendet werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1474,5 +1448,5 @@
 msgstr[1] "Die gewählten Knotenpunkte sind nicht Teil eines Weges."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1488,9 +1462,9 @@
 "Bitte auch den Weg auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Die gewählten Punkte gehören nicht zum selben Weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1498,6 +1472,6 @@
 msgstr[1] "Der gewählte Weg enthält nicht alle gewählten Punkte."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
@@ -1505,5 +1479,5 @@
 "trennen zu können."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1534,56 +1508,56 @@
 msgstr "Weg {0} in {1} Teile teilen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "GPX-Spuren umschalten"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Linien zwischen GPS-Rohdatenpunkten zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Globale Einstellung \"{0}\" umschalten."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Wege trennen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplizieren von Knoten, welche von mehreren Wegen genutzt werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Dieser Knoten ist mit nichts verbunden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Keiner dieser Knoten ist mit anderen Elementen verbunden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Keiner der Knoten dieses Weges ist mit anderen Elementen verbunden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Die aktuelle Auswahl kann nicht zum Auftrennen verwendet werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Bitte wählen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Ein Knoten mit Merkmalen, oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Ein Knoten, der von mehr als einem Weg genutzt wird, oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
@@ -1591,5 +1565,5 @@
 "oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid "* One way that has one or more nodes that are used by more than one way, or"
 msgstr ""
@@ -1597,5 +1571,5 @@
 "verwendet werden, oder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid "* One way and one or more of its nodes that are used by more than one way."
 msgstr ""
@@ -1603,5 +1577,5 @@
 "werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1615,9 +1589,9 @@
 "und alle Knoten werden ausgewählt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Knotenpunkte getrennt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1625,67 +1599,67 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "{0} Knoten in {1} Knoten teilen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Letzte Aktion zurücknehmen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Nichts auswählen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Keine Objekte auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Nichts auswählen (Fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Nichts auswählen (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Daten aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+msgid "Updates the objects in the active data layer from the server."
 msgstr "Die Objekte der aktuellen Datenebene mittels des Servers aktualisieren."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Daten aktualisieren"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr "Daten herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Aktueller Datensatz wurde nicht gefunden"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr "Kein Objekt mit der ID {0} im aktuellen Datensatz gefunden"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Auswahl aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
@@ -1693,13 +1667,13 @@
 "herunterladen)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Auswahl aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Es sind keine Objekte zur Aktualisierung ausgewählt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Auswahl leer"
@@ -1711,8 +1685,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "Alle Änderungen in der aktuellen Datenebene zum OSM-Server hochladen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1723,5 +1697,5 @@
 "gelöst werden müssen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1729,29 +1703,29 @@
 msgstr "Keine Änderungen zum Hochladen vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Nichts geändert. Erfassen Sie erst einige Daten."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr "Nur Knoten {0} synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr "Nur Weg {0} synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Nur Relation {0} synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Ganzen Datensatz synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1773,11 +1747,11 @@
 "abzubrechen und weiterzuarbeiten.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Konflikte gefunden"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1793,5 +1767,5 @@
 "weiterzuarbeiten.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1805,24 +1779,22 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Änderungssatz geschlossen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Konfliktlösung abbrechen"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr "Bereinigen von Konflikten vorbereiten"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
-#, fuzzy
+msgstr "Klicken, um alle Wege mit dem Knoten {0} zu laden"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr "Diesen Dialog schließen und Bearbeitung in JOSM fortsetzen"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr "Klicken, um abzubrechen und das Editieren der Karte wiederaufzunehmen"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1832,29 +1804,27 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+"<html>Hochladen ist <strong>fehlgeschlagen</strong>, weil der zu löschende "
+"Knoten {0} noch im Weg {1} verwendet wird.<br><br>Klicken Sie <strong>{2}</"
+"strong>, um alle Wege mit dem Knoten {0} zu laden.<br>Falls nötig wird JOSM "
+"Konflikte erstellen. Sie können diese anschließend im "
+"Konfliktbearbeitungsdialog bereinigen.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+msgstr "Ein Knoten wird noch benutzt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Hochladen <strong>fehlgeschlagen</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Hochladen zu OSM-API fehlgeschlagen"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+msgstr ""
+"Warnung: die Fehlermeldung ''{0}'' stimmt nicht mit einem erwarteten Muster "
+"überein"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Objekt aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1863,19 +1833,37 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
 #, java-format
 msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
 msgstr ""
 "WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe "
 "dieses Objekt und fahre mit dem Hochladen fort."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+"Das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe "
+"dieses Objekt beim Hochladen."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Übertrage {0} Objekte zum Server ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"Der Fehler wird ignoriert, da das Herunterladen abgebrochen wurde. Die "
+"Fehlermeldung war: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Auswahl hochladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "Alle Änderungen in der aktuellen Auswahl zum OSM-Server hochladen."
@@ -1894,11 +1882,11 @@
 msgstr "Im lokalen Datensatz auf gelöschte Elternobjekte prüfen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Hineinzoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Herauszoomen"
@@ -1978,21 +1966,17 @@
 msgstr "Langsamer abspielen"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Hole GPS-Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Heruntergeladene GPS-Daten"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "GPS-Rohdaten"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Daten herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid "Ignoring exception because download has been cancelled. Exception was: {0}"
@@ -2001,29 +1985,41 @@
 "Fehlermeldung war: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "In diesem Gebiet wurden keine Daten gefunden."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap-Daten"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "{0} von {1} herunterladen (noch {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-"Die folgenden Fehler sind während des kombinierten Herunterladens "
-"aufgetreten:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Fehler beim Herunterladen"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Daten aktualisieren"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Sichtbar (auf Server)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+#, fuzzy
+msgid ""
+"Click to check whether objects in your local dataset are deleted on the "
+"server"
+msgstr ""
+"{0} Objekt wurde aus den lokalen Daten entfernt, weil es auf dem Server "
+"bereits gelöscht ist."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignorieren"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr "Klicken, um abzubrechen und das Editieren wiederaufzunehmen"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2041,7 +2037,23 @@
 "ignorieren<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Gelöschte oder verschobene Objekte"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+"Die folgenden Fehler sind während des kombinierten Herunterladens "
+"aufgetreten: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Fehler beim Herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+msgid "Errors during download"
+msgstr "Fehler beim Herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2063,5 +2075,5 @@
 msgstr "Modus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2091,38 +2103,38 @@
 msgstr "Ausgewählt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 msgid "Cannot add a node outside of the world."
 msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:536
 msgid "Add node"
 msgstr "Knotenpunkt hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
 msgid "Add node into way"
 msgstr "Knotenpunkt in einen Weg einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547
 msgid "Connect existing way to node"
 msgstr "Existierenden Weg mit Knotenpunkt verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549
 msgid "Add a new node to an existing way"
 msgstr "Einen Knotenpunkt 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:551
 msgid "Add node into way and connect"
 msgstr "Knotenpunkt in einen Weg einfügen und verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Einen neuen Knoten erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Knoten unter Mauszeiger wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2131,14 +2143,14 @@
 msgstr[1] "Neuen Knoten in {0} Wege einfügen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "Neuen Weg an letztem Knoten beginnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Weg am letzten Knoten fortsetzen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Zeichnen beenden."
@@ -2158,5 +2170,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen."
@@ -2167,5 +2179,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Maustaste loslassen, um das Drehen zu stoppen."
@@ -2230,5 +2242,5 @@
 msgstr "Immer verschieben und diese Meldung nicht mehr anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
@@ -2236,5 +2248,5 @@
 "Punkt vereinigen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2246,4 +2258,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zoomen"
@@ -2263,5 +2276,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Suchen..."
@@ -2363,20 +2375,26 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>tags:</b>... - Objekte mit gegebener Merkmalsanzahl (<b>tags: anzahl</b> oder <b>tags: min-max</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - Alle geänderten Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - Alle ausgewählten Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - Alle unvollständigen Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - Alle Objekte ohne Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
@@ -2384,5 +2402,5 @@
 "Ausdrucks"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
@@ -2390,17 +2408,17 @@
 "Ausdrucks"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Nutzung von <b>|</b> oder <b>OR</b> zum Kombinieren mittels logischem Oder."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Nutzung von <b>\"</b> zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Nutzung von <b>(</b> und <b>)</b> zum Gruppieren von Ausdrücken."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2410,51 +2428,51 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Suche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "Filter bestätigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Suche starten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nichts gefunden für Suche ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nichts aus der Auswahl entfernt durch Suche ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Bei der Suche nach \"{0}\" konnte in der Auswahl nichts gefunden werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} Treffer gefunden"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2487,26 +2505,39 @@
 "\"relation\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unerwartete Daten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Fehlendes Argument für 'OR'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Fehlendes Argument für 'NICHT'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Schließende Klammer erwartet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr "Falsche Anzahl an Parametern für Merkmalsoperator."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Ungültiger Wert für Merkmalsoperator: {0}. Operator erwartet Merkmalsanzahl "
+"oder -bereich, z.B. \"tags: 1\" oder \"tags:2-5\"."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Falsche Anzahl an Parametern für Knoten-Operator."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2517,5 +2548,5 @@
 "oder -bereich, z.B. \"nodes:1-20\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2621,4 +2652,20 @@
 msgstr "Gegenseitige Abhängigkeiten"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2636,5 +2683,5 @@
 msgstr "Relation {0} hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
 #, java-format
 msgid "Added {0} objects"
@@ -2720,5 +2767,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Doppelter Konflikt"
@@ -2757,4 +2804,15 @@
 msgstr "Kann unentschiedenen Konflikt nicht auflösen"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "Parameter \"{0}\" darf nicht leer sein"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2785,33 +2843,6 @@
 msgstr[1] "{0} Relationen löschen"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Konflikt mit Relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Aus der Relation entfernen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>Die Auswahl \"{0}\" wird von der Relation \"{1}\" in der Rolle {2} "
-"verwendet.<br>Aus Relation entfernen?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>Die Auswahl \"{0}\" wird von der Relation \"{1}\" verwendet.<br>Aus "
-"Relation entfernen?</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Wegabschnitt aufspalten"
@@ -2819,6 +2850,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2830,5 +2861,5 @@
 "diese verwenden.<br>Wollen Sie die Knoten wirklich löschen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Löschbestätigung"
@@ -3017,15 +3048,30 @@
 msgstr "Automatische Merkmalskorrektur"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Ungültiger Gleitkommawert ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Achtung: Fehler beim speichern der Voreinstellungen in \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Ungültige Einstellungen in den Zeilen {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3036,5 +3082,5 @@
 "Verzeichnis \"{0}\" ist kein Verzeichnis ist."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3045,5 +3091,5 @@
 "\"{0}\" ist kein Verzeichnis ist.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3054,5 +3100,5 @@
 "nicht erstellt werden konnte."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3063,5 +3109,5 @@
 "Einstellungsverzeichnis konnte nicht erstellt werden: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid "Warning: Missing preference file ''{0}''. Creating a default preference file."
@@ -3070,5 +3116,5 @@
 "Standardeinstellungen."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3079,5 +3125,5 @@
 "Standardeinstellungen ersetzt."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3088,5 +3134,5 @@
 "konnte nicht auf Standardwerte zurückgesetzt werden: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3098,5 +3144,5 @@
 "Standardwerten erstellt.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3107,19 +3153,41 @@
 "konnte nicht auf Standardwerte zurückgesetzt werden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Einstellungen auf {0} gespeichert"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kann keine Einstellungen zum Server laden. Grund: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Kann keine Einstellungen vom Server laden."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3130,5 +3198,26 @@
 "werden. Die Ausnahme lautet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+"Die Lesezeichen konnten aus Sicherheitsgründen nicht von ''{0}'' geladen "
+"werden. Die Ausnahme lautet: {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "UNBEKANNT"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3150,20 +3239,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "W"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "O"
@@ -3175,4 +3264,17 @@
 msgid "Changeset {0}"
 msgstr "Änderungssatz {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid "Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3239,14 +3341,14 @@
 msgstr "Warnung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3254,5 +3356,5 @@
 msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3283,6 +3385,6 @@
 "Schlüssel mit mehreren Werten enthält"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3344,113 +3446,113 @@
 msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Flächenförmiger Weg ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygon-Weg ''{0}''  ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Gelöschtes Element ''{0}'' in der Relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Weg ''{0}'' mit weniger als zwei Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Mehr als ein Weg mit \"from\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Mehr als ein Weg mit \"to\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Mehr als ein Element mit \"via\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unbekannte Role \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unbekannter Elementtyp für \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Kein \"from\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Kein \"to\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Kein \"via\"-Knoten oder Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Innerer Weg \"{0}\" ist außerhalb."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Nicht-Weg ''{0}'' im Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Kein äußerer Weg im Multipolygon ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Innerer Weg \"{0}\" ist außerhalb."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3471,5 +3573,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3487,5 +3589,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3496,5 +3597,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3523,5 +3623,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "Hintergrund"
@@ -3576,5 +3676,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:350
 msgid "UTM"
-msgstr ""
+msgstr "UTM"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:391
@@ -3594,5 +3694,5 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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>"
@@ -3601,5 +3701,5 @@
 "Fehler war: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3628,5 +3728,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "Eisenbahn"
@@ -3643,4 +3743,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3656,33 +3758,33 @@
 msgstr[1] "{0} Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Vorbedingung nicht erfüllt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Sicherheitsausnahme"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Netzwerkausnahme"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "Ein-/Ausgabefehler"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Interner Server-Fehler"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Fehlerhafte Anfrage"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr "Nicht gefunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3690,16 +3792,16 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Rechner unbekannt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr "Objekt gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr "Hilfe anzeigen"
@@ -3712,4 +3814,8 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Nachricht des Tages herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+msgid "Click to close the dialog"
+msgstr "Klicken, um den Dialog zu schließen"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3781,74 +3887,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Benutzername"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "Verwendung"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "Optionen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Diese Hilfe anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Bounding Box herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Datei öffnen (als Roh-GPS, wenn .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Bounding Box als GPS-Spuren herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Mit der angegebenen Suche auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Mit maximiertem Fenster starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Standardwerte zurücksetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Die Sprache festlegen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr "Optionen über die Java-Systemeinstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PFAD/ZU/JOSM/ORDNER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr "Verzeichnis für alle Benutzereinstellungen ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3861,9 +3967,9 @@
 "wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "Beispiele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3874,25 +3980,25 @@
 "--selection verwendet wird."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Anstatt --download=<bbox> ist auch osm://<bbox> möglich\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Aktualisierte Plugins aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Zeitige Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Voreinstellungen setzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3905,11 +4011,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3934,6 +4040,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4036,25 +4142,22 @@
 msgstr "(kein Objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "Nutzer:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "Ebene nicht in der Liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Ebene ''{0}'' muss in der Liste der Ebenen sein"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Fehler beim Einlesen"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Datei nicht gefunden"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Nein, Operation abbrechen"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4076,5 +4179,5 @@
 msgstr "ungesetzt: diese Eigenschaft bei den gewählten Objekten nicht setzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4082,24 +4185,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125
-#, fuzzy
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
 "relation</strong>.</html>"
-msgstr "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong></html>"
+msgstr ""
+"<html>Bitte bestätigen Sie, dass <strong>1 Objekt</strong> aus <strong>1 "
+"Relation</strong> entfernt werden soll.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
 "relations</strong>.</html>"
-msgstr "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong></html>"
+msgstr ""
+"<html>Bitte bestätigen Sie, dass <strong>1 Objekt</strong> aus <strong>{0} "
+"Relationen</strong> entfernt werden kann.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
 "relations</strong>.</html>"
-msgstr "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong></html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
@@ -4115,7 +4221,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "nicht gelöscht"
+msgstr "Zum Löschen"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
@@ -4131,5 +4236,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4140,8 +4245,10 @@
 msgid "Click to close the dialog and remove the object from the relations"
 msgstr ""
+"Klicken, um das Fenster zu schließen und das Objekt aus den Relationen zu "
+"entfernen."
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340
 msgid "Click to close the dialog and to abort deleting the objects"
-msgstr ""
+msgstr "Klicken, um das Fenster zu schließen und das Löschen der Objekte abzubrechen"
 
 #. *
@@ -4178,5 +4285,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4193,5 +4300,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4405,8 +4512,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4732,6 +4839,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4745,6 +4852,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4802,36 +4909,36 @@
 msgstr "Server-Daten beinhalten keine Merkmale mit dem Schlüssel {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr "Konflikte beim Verbinden der Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr "Konflikte beim Verbinden der Wege. Verbundener Weg ist \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr "Konflikte beim Zusammenführen der Knoten. Neuer Knoten ist \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr "Konflikte beim Zusammenführen der Knoten- Zielknoten ist ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr "Es sind keine Konflikte zu lösen."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
 msgstr "Konfliktlösung abbrechen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
 msgstr "Übernehme gelöste Konflikte"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Übernehmen"
@@ -4843,5 +4950,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "alle"
@@ -4933,4 +5040,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4941,4 +5050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4952,51 +5062,82 @@
 msgstr "pos {0} außerhalb des Wertebereiches. Aktuelle Mitgliederanzahl: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr "Lösche dieses Miglied aus der Relation."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Ersetzen"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-"Ersetze den Weg in den zugehörigen Relationen durch den neuen verbundenen "
-"Weg."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Lösche dieses Miglied aus der Relation."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr "Ungelöst."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr "Noch ohne Lösung"
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Rolle:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr "Kennzeichnen der geänderten Relationen mit   "
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+msgid "Enter a role for all relation memberships"
+msgstr "Eingeben einer Rolle für alle Relationselemente"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+msgid "Tag modified relations with "
+msgstr "Kennzeichnen der geänderten Relationen mit  "
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
 msgctxt "tag"
 msgid "Key:"
 msgstr "Schlüssel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Hochladen <strong>fehlgeschlagen</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Wert:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "Füge die Rolle zu allen Mitglieder hinzu."
@@ -5035,6 +5176,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5128,10 +5269,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5198,5 +5336,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5243,4 +5382,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Aktivieren"
@@ -5266,6 +5406,6 @@
 msgstr "Ebeneninformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5274,22 +5414,22 @@
 msgstr[1] "Damit werden maximal {0} Objekte geändert."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Ein leerer Wert löscht den Schlüssel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<unterschiedlich>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Werte ändern?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5298,69 +5438,73 @@
 msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Bitte wählen Sie einen Schlüssel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Bitte wählen Sie einen Wert"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Eigenschaften/Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Eigenschaften der ausgewählten Objekte."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Element von"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Eigenschaften bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Aus der Relation entfernen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 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/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
@@ -5368,34 +5512,34 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Eine Liste aller Relationen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Editor für die gewählte Relation öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Gewählte Relation löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Eine neue Relation erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5403,7 +5547,26 @@
 "öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr "Ersetze die aktuelle Auswahl durch die selektierten Relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Gewählte Relation löschen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Bitte wählen:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Ausgewählte Verknüpfungen herunter laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+msgid "Download members"
+msgstr "Elemente herunterladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5430,5 +5593,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5440,9 +5603,9 @@
 msgstr "Auswahl: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Ansicht separat darstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
@@ -5450,5 +5613,5 @@
 "Werkzeugleiste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht"
@@ -5535,5 +5698,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Relationselemente herunterladen"
@@ -5565,23 +5729,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Merkmale und Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr "Relationen der Eltern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr "Child-Verknüpfungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5593,14 +5757,14 @@
 "Sie die zirkuläre Abhängigkeit behandeln?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr "Objekt entfernen und Verbindung lösen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorieren und die aktuelle Verbindung belassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5612,9 +5776,9 @@
 "<br><br>Wollen Sie es ein weiteres Mal in die Relation aufnehmen?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr "Mehrere Elemente verweisen auf das gleiche Objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5627,5 +5791,5 @@
 "Relation ''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid "Add all primitives selected in the current dataset before the first member"
 msgstr ""
@@ -5633,5 +5797,5 @@
 "hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid "Add all primitives selected in the current dataset after the last member"
 msgstr ""
@@ -5639,5 +5803,5 @@
 "hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5647,5 +5811,5 @@
 "ausgewählten Element hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5655,19 +5819,19 @@
 "ausgewählten Element hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr "Relations-Editor: Ausgewählte entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid "Select relation members which refer to primitives in the current selection"
 msgstr "Wählen Sie Relationselemente aus, die in der aktuellen Auswahl vorkommen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5678,66 +5842,69 @@
 "Auswahl vorkommen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr "Objekte für gewählte Relationselemente auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Relationselemente sortieren"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "Relations-Editor: Sortieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Ausgewählte Elemente nach oben schieben"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "Relations-Editor: Nach oben verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Ausgewählte Elemente nach unten schieben"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "Relations-Editor: Nach unten verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr "Das aktuell ausgewählte Element aus dieser Beziehung entfernen"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "Relations-Editor: Entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr "Die aktuell bearbeitete Beziehung löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "Konflikt erstellen und schließen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Konflikt erstellen und schließen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+"Klicken, um einen Konflikt zu erstellen und den Relationenseditor zu "
+"schließen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "Bearbeitung fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+"Klicken, um zum Relationseditor zurückzukehren und das Editieren der "
+"Relation wiederaufzunehmen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5749,9 +5916,9 @@
 "<br><br>Soll ein Konflikt erstellt und der Editor geschlossen werden?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "Datenkonflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5762,41 +5929,41 @@
 "Element<br>''{1}''.<br>Bitte lösen Sie diesen Konflikt zunächst auf.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "Aktualisierung übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Updates anwenden und den Dialog schliessen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Updates abbrechen und den Dialog schliessen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Einen leeren Schlüssel hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr "Relations-Editor: Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Definiert eine Rolle für die ausgewählten Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Rolle anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5809,17 +5976,17 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "Übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "Nicht übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr "Leere Rolle bestätigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten"
@@ -5830,9 +5997,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr "Auf das Objekt zoomen, auf welches das erste ausgewählte Element verweist"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
@@ -5840,5 +6007,5 @@
 "ist"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr "Zoom ist deaktiviert, weil kein Element ausgewählt wurde"
@@ -5852,14 +6019,14 @@
 msgstr "Verknüpft"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr "Verweisende Relationen herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr "Es wurde child.getId() >0 erwartet, aber stattdessen {1} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5911,59 +6078,88 @@
 "abgebrochen wurde. Die Fehlermeldung lautete: "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
 msgstr "Weg ist verbunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Relationselemente sortieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr "Der Weg ist zum vorangehenden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Relationselemente sortieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr "Der Weg ist mit dem nächsten Element der Relation verbunden."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+"Der Weg ist weder mit dem vorangehenden, noch mit dem nachfolgenden Element "
+"der Relation verbunden"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Bitte wählen Sie zuerst die gewünschten Koordinaten."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+msgid "Create bookmark"
+msgstr "Lesezeichen erstellen"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Die ausgewählte Relation bearbeiten"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid "Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Bitte geben Sie einen Namen für den Ort an."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr "Name des Ortes"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Bitte wählen Sie erst ein Lesezeichen."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Ausgewählte Elemente nach oben schieben"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Ausgewählte Elemente nach oben schieben"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min Breite"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "max Breite"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "max Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5973,373 +6169,134 @@
 "zu laden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Koordinaten"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Datenquellen und Typen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap-Daten"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Weg am gewählten Knotenpunkt aufspalten."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "GPS-Rohdaten"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Der gewählte Weg enthält nicht den gewählten Punkt."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Als neue Ebene laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Bereich laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Daten herunterladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+msgid "No area selected yet"
+msgstr "Es ist kein Bereich ausgewählt"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Bereich zu groß, der Server wird das Laden wahrscheinlich verbieten"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Bereich korrekt, Größe ist wahrscheinlich akzeptabel für den Server"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Klicken, um das Fenster zu schließen und das Herunterladen abzubrechen"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Die ausgewählte Relation bearbeiten"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Bitte den Ortsnamen eingeben, nach dem gesucht werden soll:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+msgid "Enter a place name to search for"
+msgstr "Bitte den Ortsnamen eingeben, nach dem gesucht werden soll."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Nullzeiger-Ausnahme, vielleicht fehlende Merkmale."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Bitte einen Suchbegriff eingeben"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Kann die Ergebnisse der Ortssuche nicht vom Server laden"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Bitte den Ortsnamen eingeben, nach dem gesucht werden soll:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Orte"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "Name"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "Typ"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "In der Nähe von"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "Zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-"<b>Zoomen:</b> Mausrad, Doppelklick oder Strg + Hoch/Runter <b>Karte "
-"verschieben:</b> Rechte Maustaste gedrückt halten und Maus bewegen oder "
-"Pfeiltasten verwenden. <b>Auswählen:</b> Linke Maustaste gedrückt halten und "
-"Rahmen aufziehen."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Interaktive Karte"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "Zoomstufe"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "X von"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "bis"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "Y von"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Kachelnummern"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr "JOSM-Hilfeanzeiger"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>Öffnen einer Verbindung zum entfernten Server<br>''{0}'' "
-"fehlgeschlagen.<br>Bitte prüfen Sie die Internetverbindung.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr "Aktuelle Hilfeseite in einem externen Browser öffnen"
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr "Die aktuelle Hilfeseite bearbeiten"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr "Die aktuelle Hilfeseite neu laden"
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+msgid "Search ..."
+msgstr "Suchen..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
 #, fuzzy
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-"Warnung: die Nachricht des Tages konnte nicht von ''{0}'' gelesen werden. "
-"Fehlermeldung war: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-#, fuzzy
-msgid "Failed to open help page"
-msgstr "Die aktuelle Hilfeseite neu laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr "Breite: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr "Länge: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr "Koordinaten"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "Versionsprotokoll für Knoten {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "Versionsprotokoll für Weg {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "Versionsprotokoll für Relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Dialog schließen"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr "Versionsprotokoll erneut vom Server laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"Die Geschichte ist noch nicht initialisiert. Fehler beim Erstellen des "
-"Referenzelements."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid "Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-"Setzen eines Referenzobjekts ist fehlgeschlagen. Die ID {0} des "
-"Referenzobjekts stimmt nicht mit der ID {1} der Objektgeschichte überein."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid "Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-"Fehler beim Erstellen des Referenzelements. Version {0} der Referenz ist in "
-"der Geschichte nicht vorhanden."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-"Die Geschichte ist noch nicht initialisiert. Fehler beim Erstellen des "
-"aktuellen Elements."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr "Aktuelle Version {0} nicht in der Versionsgeschichte vorhanden!"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Versionsprotokoll laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr "Objektnummer > 0 erwartet, jedoch {0} erhalten."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr "Versionsprotokoll für Knoten {0} laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr "Versionsprotokoll für Weg {0} laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr "Versionsprotokoll für Relation {0} laden"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Knoten {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Weg {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relation {0}"
+msgid "Click to start searching for places"
+msgstr "Richtung, in der nach Land gesucht werden soll"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6696,4 +6653,6 @@
 #. 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" />
@@ -7074,6 +7033,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7139,11 +7099,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7153,6 +7113,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7162,79 +7122,371 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Name"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Typ"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+msgid "Near"
+msgstr "In der Nähe von"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+"<b>Zoomen:</b> Mausrad, Doppelklick oder Strg + Hoch/Runter <b>Karte "
+"verschieben:</b> Rechte Maustaste gedrückt halten und Maus bewegen oder "
+"Pfeiltasten verwenden. <b>Auswählen:</b> Linke Maustaste gedrückt halten und "
+"Rahmen aufziehen."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Interaktive Karte"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "Zoomstufe"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "X von"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "bis"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "Y von"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Kachelnummern"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+"Die CSS-Datei ''help-browser.css'' konnte nicht geladen werden. "
+"Fehlermeldung: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr "JOSM-Hilfeanzeiger"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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\">Hilfe-Seite für ein Hilfe-Thema fehlt</"
+"p><p class=\"warning-body\">Für das Hilfe-Thema <strong>{0}</strong> ist "
+"noch keine Hilfe-Seite verfügbar. Sie fehlt sowohl in Ihrer lokalen Sprache "
+"({1}) als auch in Englisch.<br><br>Bitte helfen Sie, das JOSM-Hilfe-System "
+"zu verbessern und tragen Sie die fehlenden Informationen nach.  Sie können "
+"sowohl die <a href=\"{2}\">Hilfe-Seite in ihrer lokalen Sprache ({1})</a>, "
+"als auch die <a href=\"{3}\">Hilfe-Seite in Englisch</a> editieren.</p></"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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\">Fehler beim Lesen der Hilfe-Seite</p><p "
+"class=\"error-body\">Der Inhalt für das Hilfe-Thema <strong>{0}</strong> "
+"konnte nicht geladen werden. Die Fehlermeldung ist:<br><tt>{1}</tt></p></"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+"<html>Die Hilfe-Seite unter der URL  {0} konnte nicht geöffnet werden."
+"<br>Vermutlich ist Ihre Internet-Verbindung unterbrochen.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr "Die URL konnte nicht geöffnet werden"
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr "Aktuelle Hilfeseite in einem externen Browser öffnen"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr "Die aktuelle Hilfeseite bearbeiten"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr "Die aktuelle Hilfeseite neu laden"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr "Zur vorherigen Seite gehen"
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr "Zur nächsten Seite gehen"
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr "Gehe zur Start-Seite für die JOSM-Hilfe"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr "Die Hilfe-Seite konnte nicht geöffnet werden. Die Ziel-URL ist leer."
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr "Die Hilfe-Seite konnte nicht geladen werden"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr "Der externe Hilfe-Browser konnte nicht geöffnet werden"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr "Breite: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr "Länge: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr "Koordinaten"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "Versionsprotokoll für Knoten {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "Versionsprotokoll für Weg {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "Versionsprotokoll für Relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Dialog schließen"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr "Versionsprotokoll erneut vom Server laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+"Die Geschichte ist noch nicht initialisiert. Fehler beim Erstellen des "
+"Referenzelements."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid "Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+"Setzen eines Referenzobjekts ist fehlgeschlagen. Die ID {0} des "
+"Referenzobjekts stimmt nicht mit der ID {1} der Objektgeschichte überein."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid "Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+"Fehler beim Erstellen des Referenzelements. Version {0} der Referenz ist in "
+"der Geschichte nicht vorhanden."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+"Die Geschichte ist noch nicht initialisiert. Fehler beim Erstellen des "
+"aktuellen Elements."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr "Aktuelle Version {0} nicht in der Versionsgeschichte vorhanden!"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Versionsprotokoll laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr "Objektnummer > 0 erwartet, jedoch {0} erhalten."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr "Versionsprotokoll für Knoten {0} laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr "Versionsprotokoll für Weg {0} laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr "Versionsprotokoll für Relation {0} laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Knoten {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Weg {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Nutzer"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr "Änderungssatz"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
@@ -7316,4 +7568,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr "Auswahldialog für Datei öffnen"
@@ -7601,4 +7854,6 @@
 msgid "Decide how to upload the data and which changeset to use"
 msgstr ""
+"Entscheiden Sie, wie Daten hochgeladen werden sollen und welcher "
+"Änderungssatz verwendet wird"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
@@ -7634,8 +7889,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
 #, java-format
-msgid "{0} object to modifiy:"
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] "{0} bearbeitetes Objekt:"
-msgstr[1] "{0} bearbeitete Objekte:"
+msgstr[0] "{0} zu bearbeitendes Objekt:"
+msgstr[1] "{0} zu bearbeitende Objekte:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7733,5 +7988,16 @@
 msgstr "ID > 0 für den Änderungssatz erwartet. Wert {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"WARNUNG: das Objekt ''{0}'' ist auf dem Server bereits gelöscht. Überspringe "
+"dieses Objekt und fahre mit dem Hochladen fort."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr "Objekte zum Hochladen vorbereiten..."
@@ -7765,59 +8031,59 @@
 msgstr "Mit Hochladen fortfahren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Bilder für {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "GPX lesen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Keine Zeit für Punkt {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Zeit \"{0}\" vom Punkt {1} x {2} konnte nicht gelesen werden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Einlesen {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Keine Bilder mit lesbaren Zeitstempel gefunden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Einlesen {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Georeferenzierte Bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS Start: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS Ende: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "Aktueller Unterschied: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "Zeitzonen Unterschied: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7825,51 +8091,51 @@
 msgstr[1] "Bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} innerhalb der GPS-Spur."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Uhrzeit synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-Bilder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Das Datum in der Datei \"{0}\" konnte nicht verarbeitet werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Keine EXIF-Zeitinformationen in der Datei \\\"{0}\\\" enthalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Bild"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Angezeigtes Datum eingeben (mm/tt/jjjj HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Zeitzone des GPS-Geräts (Unterschied zum Foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Zeit mit GPS-Gerät synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Die eingegebene Zeit konnte nicht eingelesen werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7877,30 +8143,30 @@
 msgstr "GPS-Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Linienaussehen anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Globale Einstellungen verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Linienaussehen wählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7908,5 +8174,5 @@
 msgstr "Farben anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7915,5 +8181,5 @@
 msgstr "Voreinstellung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7922,43 +8188,43 @@
 msgstr "Farbe auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Marken von benannten Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benannte GPS-Punkte von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Audio importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Audio-Dateien im Wave-Format (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio-Marken von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Beschreibung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7968,28 +8234,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr "Zeitraum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Länge: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7998,5 +8264,5 @@
 msgstr[1] "{0} Routen, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -8005,10 +8271,10 @@
 msgstr[1] "{0} Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -8018,11 +8284,11 @@
 "<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -8032,29 +8298,29 @@
 msgstr "Konvertiert von: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Alles im Bereich herunterladen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} Meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Maximalgebiet je Anfrage:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -8065,9 +8331,5 @@
 "fortfahren?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr "Daten herunterladen"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -8075,5 +8337,5 @@
 "werden kann."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8083,5 +8345,5 @@
 "wurden ignoriert oder an den Anfang verschoben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8091,23 +8353,23 @@
 "der GPS-Spur entfernt waren, wurden ignoriert."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datenebene {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "Außerhalb des heruntergeladenen Bereichs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8116,12 +8378,13 @@
 msgstr[1] "{0} Konflikte wurden entdeckt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, fuzzy, java-format
 msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+"{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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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} Objekt wurde aus den lokalen Daten entfernt, weil es auf dem Server "
@@ -8132,27 +8395,42 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr "Bitte benutzen Sie die Konfliktanzeige<br>und lösen die Konflikte manuell."
-
+#, fuzzy, 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] "Bitte benutzen Sie die Konfliktanzeige<br>und lösen die Konflikte manuell."
+msgstr[1] "Bitte benutzen Sie die Konfliktanzeige<br>und lösen die Konflikte manuell."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+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:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] "{0} gelöscht"
+msgstr[1] "{0} gelöscht"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} besteht aus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} gelöscht.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "nicht angegeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "API-Version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8326,6 +8604,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8340,6 +8616,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8523,5 +8797,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8557,5 +8831,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr "Positionsverschlechterung (rot = hoch, grün = langsam, wenn verfügbar)"
+msgstr "Positionsverschlechterung (rot = hoch, grün = niedrig; nur wenn verfügbar)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
@@ -8863,21 +9137,20 @@
 msgstr "Sprache"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Voreinstellungen laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 msgid "Enable built-in icon defaults"
 msgstr "Integrierte Standardsymbole aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+msgid "Used style"
+msgstr "Benutzter Stil"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
 msgid "Map Paint Styles"
 msgstr "MapPaint Stile"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
-msgid "Used style"
-msgstr "Benutzter Stil"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -8891,6 +9164,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Aktualisieren"
@@ -9043,68 +9315,105 @@
 msgstr "Tastaturkürzel"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr "Aktive Stile"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr "Symbolpfad"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Kurzbeschreibung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "Autor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Webseite: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr "Symbolpfad"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Standard kopieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Bitte wählen Sie eine Zeile zum Kopieren."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr "XML-Einstellungsdatei (URL oder Dateiname) für {0} Definitionen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr "Neue XML-Quelle zur Liste hinzufügen"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Ausgewählte Quelle aus der Liste entfernen."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr "Standard (siehe Tooltip für detailierte Informationen)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "Lösche die ausgewählten Einträge aus der Liste der vereinigten Elemente."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Neues Tag hinzufügen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Ausgewählten offenen Änderungssatz schließen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Ausgewählte Quelle bearbeiten."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Versionsprotokoll für Knoten {0} laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Datenübertragungsfehler zum Server<br>\"{0}\"<br>beim Hoch- oder "
+"Herunterladen.<br>Details: {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, fuzzy, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr "Ungültiger Wert ''{1}'' für das Attribut ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Objektvorlagenmenü sortieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9306,5 +9615,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Mehr Informationen zu dieser Vorlage"
@@ -9369,16 +9678,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Vorlagengruppe \"{0}\""
+msgstr "Vorlagengruppe {1} / {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Vorlagengruppe \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr "Vorlagengruppe {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9386,5 +9695,5 @@
 msgstr "Verbindung zum OSM-Server..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9495,5 +9804,5 @@
 msgstr "Fehler beim Einlesen von Datei \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument"
@@ -9728,5 +10037,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9755,5 +10064,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9761,5 +10070,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9772,5 +10081,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9781,33 +10090,33 @@
 msgstr "Liste der Änderungssätze einlesen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Passwort oder Benutzername falsch."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Benutzername und Passwort (unverschlüsselt) speichern"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Die Basis-URL des OSM Servers (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Benutzername (E-Mail) für den OSM-Server."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
@@ -9815,17 +10124,17 @@
 "soll."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Server Basis-URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "OSM-Benutzername (E-Mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM-Passwort"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9936,5 +10245,5 @@
 msgstr "Die Datei \"{0}\" existiert nicht"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9945,19 +10254,19 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Das XML-Element <nd> ist kein unmittelbares Kindelement von <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "Fehlendes obligatorisches Attribut \"{0}\" auf <nd> des Wegs {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "Ungültiger Wert \"{0}\" des Attributs \"ref\" im Element <nd>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
@@ -9965,20 +10274,20 @@
 "gefunden"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr "Ungültiger Wert \"{1}\" für Attribut \"ref\" bei Element der Relation {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Fehlendes Attributs \"type\" bei Mitglied {0} der Relation {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
@@ -9987,9 +10296,9 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Unvollständige <member>-Beschreibung mit ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
@@ -9998,10 +10307,10 @@
 "Dieses wird ignoriert."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Illegales Objekt mit id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -10012,7 +10321,11 @@
 "{0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -10025,25 +10338,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "Das Attribut ''version'' für das OSM Element mit der ID {0} fehlt"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "Fehlendes erforderliches Attribut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid "Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
@@ -10052,5 +10365,5 @@
 "mit externer ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -10061,5 +10374,5 @@
 "einer seiner {1} Knoten in den geladenen Daten fehlt."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid "Unknown relation member type ''{0}'' in relation with external id ''{1}''."
@@ -10068,5 +10381,5 @@
 "externer ID ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -10077,13 +10390,13 @@
 "externer ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "OSM-Daten werden vorbereitet...."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr "OSM-Daten einlesen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr "Datensatz wird vorbereitet ..."
@@ -10094,14 +10407,13 @@
 msgstr "ID-Parameter ''{0}'' > 0 verlangt. Wert ist {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Von OSM-Server herunterladen..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr "Vom OSM-Server laden..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr "Lade referenzierende Wege herunter..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr "Lade referenzierende Relationen herunter..."
@@ -10218,15 +10530,15 @@
 "Server-API es nicht versteht."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Plugins aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Plugins herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10239,29 +10551,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "{0} Plugin erfolgreich heruntergeladen. JOSM bitte neustarten."
 msgstr[1] "{0} Plugins erfolgreich heruntergeladen. JOSM bitte neustarten."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Plugin {0} herunterladen..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Herunterladen überspringen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Plugin herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Herunterladen überspringen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10273,5 +10589,5 @@
 msgstr "Ein Fehler ist in dem Plugin {0} aufgetreten."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -10280,5 +10596,5 @@
 "benötigt."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10287,50 +10603,62 @@
 "<br>Delete from preferences?</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+"<html>Laden des Plugins {0} wurde angefordert.<br>Das Plugin wird nicht mehr "
+"gewartet und es ist sehr wahrscheinlich, dass es Fehler verursacht.<br>Bitte "
+"deaktivieren Sie es.<br>Soll es aus den Einstellungen entfernt werden?</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Letzte Aktualisierung der Plugins vor mehr als {0} Tagen."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Plugins aktualisieren"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Das Plugin {0} benötigt eine JOSM-Aktualisierung auf Version {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Das Plugin {0} wird vom Plugin {1} benötigt aber nicht gefunden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Plugin nicht gefunden: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Letzte Aktualisierung der Plugins vor mehr als {0} Tagen."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Sie können den Zeitraum, nach dem diese Warnung erscheint über<br>über die "
-"Konfigurationsoption 'pluginmanager.warntime' (Wert in Tagen) ändern.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Plugin {0} konnte nicht geladen werden. Aus den Einstellungen entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Plugin abschalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Plugin behalten"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10340,9 +10668,9 @@
 "die Rechte besitzt die vorhandenen Plugins zu überschreiben."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid "An unexpected exception occurred that may have come from the ''{0}'' plugin."
@@ -10351,10 +10679,10 @@
 "ausgelöst haben könnte."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Laut den Informationen des Plugins ist der Autor des Plugins {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
@@ -10362,9 +10690,9 @@
 "Plugins, bevor Sie den Fehler melden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Soll das Plugin abgeschaltet werden?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10374,5 +10702,5 @@
 "um das Plugin zu entfernen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
@@ -10380,18 +10708,18 @@
 "deaktiviert."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Plugin-Information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "keine Beschreibung verfügbar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Mehr Details"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10400,18 +10728,18 @@
 msgstr[1] "Plugin-Informationen von {0} Quellen geladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Keine Plugin-Informationen gefunden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Plug-in {0} ist nicht verfügbar. Update wurde übersprungen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Alle installierten Plugins sind aktuell."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10424,9 +10752,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Fehlende Plugins herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10441,9 +10769,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10465,19 +10793,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin mit JOSM ausgeliefert"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10543,5 +10871,5 @@
 msgstr "(Der Text wurde bereits in Ihre Zwischenablage kopiert.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10553,5 +10881,5 @@
 "Internetverbindung.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10563,5 +10891,5 @@
 "Zeitablauf automatisch geschlossen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10575,5 +10903,5 @@
 "{0} und laden Sie erneut hoch.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10586,10 +10914,10 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+msgstr "Die Zeichenkette ''{0}'' konnte nicht in ein Datum umgewandelt werden."
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10597,6 +10925,8 @@
 "already been closed.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+"<html>Schließen des Änderungssatzes <strong>{0}</strong> ist fehlgeschlagen,"
+"<br> weil der Änderungssatz bereits geschlossen wurde.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10604,17 +10934,19 @@
 "already been closed on {1}.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
-#, java-format
+"<html>Schließen des Änderungssatzes <strong>{0}</strong> ist fehlgeschlagen,"
+"<br> weil der Änderungssatz bereits am {1} geschlossen wurde.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
+#, fuzzy, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr "<html>Der Server hat einen Konflikt identifiziert.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+msgstr "<html>Der Server hat einen Konflikt identifiziert.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10627,5 +10959,5 @@
 "Applet<br>nicht von ''{1}'' geladen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10636,5 +10968,5 @@
 "fehlgeschlagen.<br>Bitte prüfen Sie die Internetverbindung.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10645,5 +10977,5 @@
 "Herunterladen.<br>Details: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10655,10 +10987,10 @@
 "später erneut.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "Der OSM-Server \"{0}\" meldet eine Fehlerhafte Anfrage. <br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10670,10 +11002,10 @@
 "Datenbankexport."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Fehlermeldung (englisch): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10688,5 +11020,5 @@
 "<br>Bitte überprüfen Sie die Server-Adresse ''{0}'' sorgfältig."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10700,5 +11032,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10714,5 +11046,5 @@
 "<br><br>Die Fehlermeldung lautet:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10746,4 +11078,7 @@
 "''{0}''. Using default code ''en''."
 msgstr ""
+"Warnung: Das Sprach-Präfix für das JOSM-Wiki konnte nicht aus den aktuellen "
+"Spracheinstellungen ''{0}'' abgeleitet werden. Die Standardspracheinstellung "
+"''en'' wird benutzt."
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
@@ -10835,13 +11170,4 @@
 "Voreinstellung des Schlüssels \"{0}\" existiert nicht. Fenstergröße kann "
 "nicht aus den Einstellungen geladen werden."
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
-msgstr ""
-"Achtung: Fenstergröße konnte nicht vom Schlüssel \"{0}\" geladen werden. Es "
-"werden die Standardeinstellungen genutzt. Details: {1}"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -10987,5 +11313,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -11001,10 +11328,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "ungerade"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -11012,59 +11339,59 @@
 msgstr "gerade"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr "Alphabetisch"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr "Relation: {0}"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr "Mit Straße verknüpfen per:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr "Nummerierungsschema:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr "Startnummer:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr "Endnummer:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr "{0} zusätzliche Hausnummern-Knoten werden verküpft"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr "Stadt:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr "Bundesland/-staat:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr "Postleitzahl:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr "Land:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr "Vollständige Adresse:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr "Optionale Adressinformationen:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
@@ -11072,5 +11399,5 @@
 "verknüpft werden soll"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
@@ -11078,41 +11405,41 @@
 "verknüpft werden soll"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr "Ungerade Hausnummern erwartet"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr "Gerade Hausnummern erwartet"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr "Ländercode muss aus 2 Buchstaben bestehen"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr "Bitte eine gültige Nummer für die Start und Ende eingeben"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr "Alphabetische Adressen müssen mit einem Buchstaben aufhören"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr "Start- und Endnummer müssen für alphabetische Adressen identisch sein"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr "Der Startbuchstabe muss im Alphabet vor dem Endbuchstaben liegen."
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr "Bitte eine gültige Nummer für die Startnummer eingeben"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr "Bitte eine gültige Nummer für die Endnummer eingeben"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr "Die Startnummer muss kleiner als die Endnummer sein."
@@ -11166,46 +11493,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-Positionen aus EXIF-Daten extrahieren"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Verzeichnisuntersuchen starten"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Eine der ausgewählten Datei war leer!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Photos lesen..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kann generischen Pfad für Verzeichnis{0} nicht bestimmen\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Verzeichnis {0} untersuchen"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Leere Datei im Verzeichnis {0} gefunden\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fehler beim Lesen der Dateien im Verzeichnis {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Mit GPX korrelieren"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11472,5 +11800,5 @@
 msgstr "Fehler bei Datei {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11486,10 +11814,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr "Feuille auswählen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11539,13 +11867,13 @@
 msgstr "Wähle aus..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Automatische Quellenangabe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11558,13 +11886,13 @@
 "Wollen Sie <F11> wieder zum Bilder holen nutzen?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr "Tastaturkürzel <F11> wiederherstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM wird zum Aktivieren der Änderung beendet."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid "Warning: failed to put option pane dialog always on top. Exception was: {0}"
@@ -11685,7 +12013,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Koordinaten anzeigen als"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11703,5 +12030,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11746,13 +12073,13 @@
 msgstr "Grenze erstellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr "Kataster-WMS wird kontaktiert..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr "Bild wurde schon geladen."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11809,4 +12136,6 @@
 "Do you want to use them ?"
 msgstr ""
+"Dieses Bild enthält georeferenzierte Daten.\n"
+"Wollen Sie sie benutzen?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:169
@@ -11875,5 +12204,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:32
 msgid "Set manually the Lambert zone"
-msgstr ""
+msgstr "Setzen Sie die Lambert-Zone manuell"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43
@@ -11892,24 +12221,24 @@
 #, java-format
 msgid "{0} not allowed with the current projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+msgstr "{0} ist in der aktuellen Projektion nicht erlaubt"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Ort ändern"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Für die nächste Anfrage eine neue Position setzen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Neue Ebene hinzufügen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Ort"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11919,5 +12248,5 @@
 "bekannte Syntax.</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Eine neue Ebene hinzufügen"
@@ -11931,9 +12260,9 @@
 msgstr "Einen neuen Cookie holen (Sitzung abgelaufen)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr "PNG-Bilder (*.png)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr "Im PNG-Format exportieren (nur Pixelgrafiken)"
@@ -11953,9 +12282,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "Die Position der gewählten WMS-Ebene anpassen"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr "Position des WMS-Layers justieren (nur Rasterbilder)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11979,5 +12307,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Leere Ebene"
@@ -12006,5 +12334,5 @@
 msgstr "Kommunen-Koordinatenfenster: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -12016,9 +12344,9 @@
 "Erzeuge eine neue Datei."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Zwischenspeicher-Formatfehler"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -12027,9 +12355,9 @@
 "inkompatibel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Lambert-Zonenfehler zwischenspeichern"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -12127,5 +12455,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Keine Daten geladen."
@@ -12534,7 +12862,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "Wasser"
@@ -12745,11 +13073,11 @@
 msgstr "Live GPS-Ebene"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "GPS-Spur aufzeichnen"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
@@ -12757,22 +13085,22 @@
 "anzeigen."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Einmalig zentrieren"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Die LiveGPS-Ebene auf die aktuelle Position zentrieren."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Automatisch zentrieren"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Die LiveGPS-Ebene kontinuierlich auf die aktuelle Position zentrieren."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "Live GPS"
@@ -12851,5 +13179,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92
 msgid "Unable to order the ways. Please verify their directions"
-msgstr ""
+msgstr "Die Wege können nicht geordnet werden. Bitte überprüfen Sie die Richtungen."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:106
@@ -12863,24 +13191,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr "Multipolygon erstellen"
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr "Multipolygon erstellen."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -13040,4 +13368,9 @@
 msgstr "Firefox-Programm"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Ebene"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -13086,26 +13419,26 @@
 msgstr "Erlaubte Aktionen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Die Fernsteuerung soll Daten vom API herunterladen."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Details der Anfrage: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Soll dies erlaubt werden?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Fernsteueraktion bestätigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
@@ -13113,5 +13446,5 @@
 "erstellen kann."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Die Fernsteuerung soll Daten von folgender URL herunterladen:"
@@ -13130,7 +13463,5 @@
 msgstr "Es ist keine Relation ausgewählt"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -13139,4 +13470,5 @@
 #: ../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 "Routenführung"
@@ -13158,25 +13490,25 @@
 msgstr "Eine Liste von Routenknoten öffnen"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
 msgstr "Routing-Ebene hinzufügen"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Kriterien"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "Kürzeste"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "Schnellste"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Route umdrehen"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Route löschen"
@@ -13206,93 +13538,87 @@
 msgstr "Gewichtswerte eingeben"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Karte"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Automatisches Zoomen: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Lade Kachel"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "Kachelstatus anzeigen"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Aktualisieren"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Informationen anzeigen"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Alle Kacheln laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Zoom erhöhen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Zoom reduzieren"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr "Kachel-Zwischenspeicher leeren"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "Bild "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "Automatisch Zoomen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "Kacheln automatisch laden"
 
 #. 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "Karte"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Einstellungen für das Karten-Plugin."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Quellen der Kacheln"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Automatisches Zoomen: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Kacheln automatisch laden: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Max. Zoomstufe: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Max. Zoomstufe: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Hintergrund ausblenden: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "Fehler beim Laden der Metadaten"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr "Fehler bei Aktualisierungsanforderung: Nicht Zoomstufe 12"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "Angefordert: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "Fehler bei der Aktualisierungsanforderung"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -13305,5 +13631,5 @@
 msgstr "Aufgezeichnete Daten jede Minute speichern."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13466,5 +13792,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Straßenname"
@@ -13512,29 +13838,29 @@
 msgstr "Bitte mindestens einen geschlossenen Weg zum Vereinigen wählen."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Knoten auf allen Schnittpunkten erstellt"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Wege entfernen, die nicht teil des inneren Multipolygons sind"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Relationen korrigieren"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Selbstüberlappende Gebiete verbunden"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Überlappende Gebiete verbunden"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13544,33 +13870,33 @@
 "prüfen Sie, dass keine Fehler entstanden sind."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Werte für alle Konflikte festlegen."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Konflikte auflösen"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Merkmalskonflikte beheben"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Elemente aus Relationen entfernt"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Flächen verbinden: Kurze Wege entfernen"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Weg geschlossen"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Merkmale von inneren Wegen entfernen"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Funktion zum Flächen verbinden"
@@ -13780,8 +14106,4 @@
 msgstr "Ausgewählte Fehler korrigieren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignorieren"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13826,25 +14148,24 @@
 msgstr "\"{0}\" mit \"{1}\" ersetzen für"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Küsten."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Dieser Test überprüft, ob die Küsten korrekt sind."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Ungeordnete Küsten"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Ungeordnete Küsten"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Ungeordnete Küsten"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13869,18 +14190,18 @@
 msgstr "Überschneidende Wege"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Doppelte Knoten"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Dieser Test überprüft auf doppelte Knoten an der selben Stelle."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Knoten auf derselben Position"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Bestätigung"
@@ -14131,4 +14452,8 @@
 msgstr "Ausgewählte Quelle bearbeiten."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Ausgewählte Quelle aus der Liste entfernen."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14345,7 +14670,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "Gebäude"
@@ -14359,5 +14684,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "Fläche"
@@ -14367,9 +14692,9 @@
 msgstr "Nicht geschlossener Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Unverbundene Wege."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -14377,17 +14702,17 @@
 "hat."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Wegende nahe anderer Straße"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Wegende nahe anderem Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Wegpunkt nahe anderem Weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Verbundenes Wegende nahe anderem Weg"
@@ -14487,22 +14812,26 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
-#, fuzzy
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr "Walking Papers: {0}"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "Startknoten an einem Wegende auswählen"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "Ende des Pfades erreicht"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "Kreuzung erreicht"
@@ -14771,9 +15100,9 @@
 msgstr "Dateiformatfehler"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Eine leere WMS-Ebene öffnen, um Daten aus einer Datei zu laden"
@@ -15266,6 +15595,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Referenz"
@@ -15827,5 +16156,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr "Metall"
@@ -15837,5 +16166,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "Holz"
@@ -16123,7 +16452,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "ja"
@@ -16272,8 +16601,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "nein"
@@ -16400,31 +16729,4 @@
 msgstr "Kreuzung bearbeiten"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Typ"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16545,5 +16847,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "Ortsstraße"
@@ -16578,5 +16880,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "Service"
@@ -16611,5 +16913,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "Baustelle"
@@ -16999,12 +17301,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Betreiber"
@@ -17217,6 +17519,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Höhe"
@@ -17643,5 +17945,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "Marsch"
@@ -18174,25 +18476,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Öffnungszeiten"
@@ -18258,24 +18560,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr "24/7"
@@ -18288,24 +18590,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
@@ -18318,24 +18620,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
@@ -18368,6 +18670,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Referenznummer"
@@ -18383,5 +18685,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "Tiefgarage"
@@ -18395,5 +18697,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Gebühr"
@@ -18629,5 +18931,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Schutzraum"
@@ -19095,5 +19397,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Radfahren"
@@ -19108,5 +19410,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skifahren"
@@ -19260,16 +19562,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Ausgrabungsstelle"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Ausgrabungsstelle bearbeiten"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -19277,55 +19592,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Grenzstein"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Grenzstein bearbeiten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Spielplatz"
@@ -19333,35 +19648,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Spielplatz bearbeiten"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -19375,6 +19690,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "Sportart wählen:"
@@ -19766,30 +20081,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "Sport"
@@ -19799,227 +20114,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "Mehrfachnutzung"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "Bogenschießen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "Leichtathletik"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "Australian Football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "Baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "Boule"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "Bowls"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "Kanu"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "Klettern"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "Kricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "Kricketnetze"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "Krocket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "Fahrradfahren"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "Hunderennen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "Reiten"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "American Football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "Gymnastik"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "Pferderennen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "Schlagball (Racquet)"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "Schießen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "Skateboard"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "Eislaufen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "Skifahren"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "Fußball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "Schwimmen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "Tischtennis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
+
+#. 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 "Typ"
 
 #. item "Sport/Multi" combo "type"
@@ -20056,203 +20424,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "Spielfeld"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "Sporthalle / Fitnesscenter"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "Stadion"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "Weg"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Motorsportplatz bearbeiten"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
@@ -20260,56 +20628,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Pistentyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "Schneepark"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "mittelschwer"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "Freistil"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Schießen"
@@ -20317,182 +20685,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Schießbahn bearbeiten"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "American Football-Platz bearbeiten"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Australian Foootball-Platz bearbeiten"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "Golfanlage"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Rugbyplatz bearbeiten"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Tennisplatz bearbeiten"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Gebäude"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Gebäude"
@@ -20500,5 +20868,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -20506,10 +20874,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Öffentliches Gebäuden bearbeiten"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Rathaus"
@@ -20517,10 +20885,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Rathaus bearbeiten"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Botschaft"
@@ -20528,10 +20896,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Botschaft bearbeiten"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Gericht"
@@ -20540,10 +20908,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Gericht bearbeiten"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Gefängnis"
@@ -20552,10 +20920,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Gefängnis bearbeiten"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polizei"
@@ -20565,10 +20933,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Polizei bearbeiten"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -20577,10 +20945,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Feuerwache bearbeiten"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Post"
@@ -20588,5 +20956,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Post bearbeiten"
@@ -20594,15 +20962,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Schule"
@@ -20610,10 +20978,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Schule bearbeiten"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universität"
@@ -20621,10 +20989,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Universität bearbeiten"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Hochschule"
@@ -20632,5 +21000,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "College bearbeiten"
@@ -20638,5 +21006,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kino"
@@ -20645,10 +21013,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Kino bearbeiten"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliothek"
@@ -20657,9 +21025,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Bibliothek bearbeiten"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -20667,10 +21035,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Kulturzentrum bearbeiten"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Theater"
@@ -20679,10 +21047,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Theater bearbeiten"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -20692,5 +21060,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Kirche bearbeiten"
@@ -20699,6 +21067,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religion"
@@ -20707,66 +21075,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahaiistisch"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "buddhistisch"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "christlich"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hinduistisch"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "jainistisch"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "jüdisch"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "moslemisch"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikhistisch"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "spiritistisch"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoistisch"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "unitarisch"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastrisch"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Konfession"
@@ -20775,81 +21143,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglikanisch"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptistisch"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "katholisch"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangelikal"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "Zeugen Jehovas"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "lutherisch"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "methodistisch"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormonisch"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "Pfingstgemeinde"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbyterianisch"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestantisch"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "Quäker"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "schiitisch"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunnitisch"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adressen"
@@ -20858,5 +21226,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Adressinformationen bearbeiten"
@@ -20864,5 +21232,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Hausnummer"
@@ -20870,20 +21238,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Hausname"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Ortsname"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postleitzahl"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Länderkennung"
@@ -20892,5 +21260,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Adressinterpolation bearbeiten"
@@ -20898,61 +21266,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Nummernschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "ungerade"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "gerade"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alphabetisch"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Turm"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Art  des Turms"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "Kommunikation"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "Beobachtung"
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Höhe (in Meter)"
@@ -20960,25 +21328,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -20986,10 +21354,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Leuchtturm bearbeiten"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Windmühle"
@@ -20997,10 +21365,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Windmühle bearbeiten"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -21009,37 +21377,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Pipeline bearbeiten"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "Öl"
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "Gas"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "Abwasser"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "Wärme"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "Beliebige Substanz"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "Unter Wasser"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "oberirdisch"
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -21049,10 +21417,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Kläranlage bearbeiten"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -21060,10 +21428,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Stationären Kran bearbeiten"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Bake"
@@ -21071,10 +21439,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Bake bearbeiten"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -21082,10 +21450,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -21093,5 +21461,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Überwachungskamera bearbeiten"
@@ -21099,5 +21467,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -21107,35 +21475,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Stromgenerator bearbeiten"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -21144,10 +21512,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Umspannwerk bearbeiten"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -21156,5 +21524,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Trafostation bearbeiten"
@@ -21162,10 +21530,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Liniennummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Strommast"
@@ -21176,23 +21544,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Strommast bearbeiten"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr "Turm"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr "Mast"
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr "Identifikation des Turms"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Stromleitung"
@@ -21201,75 +21569,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Stromleitung bearbeiten"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr "Art der Stromleitung"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr "Freileitung (Starkstrom)"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr "Freitleitung (Schwachstrom)"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Spannung"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr "Anzahl Leitungen"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Anzahl der Adern (besser: Leiter) je Stromkabel"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr "einzeln"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr "doppelt"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr "dreifach"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr "vierfach"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Einrichtungen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Toiletten"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefon"
@@ -21278,5 +21646,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Telefon bearbeiten"
@@ -21284,5 +21652,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Münzen"
@@ -21290,5 +21658,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Scheine"
@@ -21296,5 +21664,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
@@ -21302,5 +21670,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Konto- oder EC-Karten"
@@ -21308,15 +21676,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Kreditkarten"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -21325,5 +21693,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Recyclingstelle oder -container bearbeiten"
@@ -21331,35 +21699,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Batterien"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Dosen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Kleidung"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Altmetall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Bank"
@@ -21368,31 +21736,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr "Lehne"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr "Stein"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr "Kunststoff"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr "Farbe"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr "schwarz"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr "braun"
@@ -21463,40 +21831,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "grün"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr "rot"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr "blau"
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "Gras"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr "weiß"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr "Anzahl der Sitzplätze"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Jagdanstand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
@@ -21505,30 +21872,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Höhe"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "voll"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Versteck"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Schloß"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -21537,10 +21904,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Springbrunnen bearbeiten"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -21549,10 +21916,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Trinkwasserabgabe bearbeiten"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Babyklappe"
@@ -21560,33 +21927,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Babyklappe bearbeiten"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Geschäfte"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Supermarkt bearbeiten"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr "Drogerie bearbeiten"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Tante-Emma-Laden"
@@ -21594,9 +21961,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Tante-Emma-Laden bearbeiten"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -21604,27 +21971,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Kiosk bearbeiten"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr "Buchhandlung"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr "Buchhandlung bearbeiten"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "Reisebüro"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "Reisebüro bearbeiten"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Verkaufsautomat"
@@ -21632,5 +21999,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Automaten bearbeiten"
@@ -21638,88 +22005,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Automatenprodukte"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "Fahrscheine"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "Pläne des öffentlichen Nahverkehrs"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "Parkscheine"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "Essen"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "Getränke"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "Süßigkeiten"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "Zigaretten"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "Tiernahrung"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "Zeitungen"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "Spielzeug"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "Briefmarken"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-Karten"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "Telefonkarten"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "Kondome"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "Tampons"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "Hundekot-Tüten"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "Kundenkarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Fleischer"
@@ -21727,9 +22094,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Fleischer bearbeiten"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Bäcker"
@@ -21737,9 +22104,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Bäcker bearbeiten"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Blumenladen"
@@ -21747,18 +22114,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Blumenladen bearbeiten"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Bioladen"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Bioladen bearbeiten"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Spirituosen"
@@ -21766,54 +22133,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Spirituosengeschäft bearbeiten"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Getränke"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Getränkeladen bearbeiten"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Computergeschäft bearbeiten"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Elektronikgeschäft"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Elektronikgeschäft bearbeiten"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Hifi-Geschäft bearbeiten"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Mobiliar"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Möbelgeschäft bearbeiten"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Gartenzentrum"
@@ -21821,9 +22188,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Gartenzentrum bearbeiten"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Haushaltswaren"
@@ -21831,9 +22198,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Haushaltswaren bearbeiten"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Heimwerkerbedarf"
@@ -21841,54 +22208,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Bürobedarf"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Bürobedarf bearbeiten"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Friseur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Friseur bearbeiten"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Schuhe"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Schuhladen bearbeiten"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Spielzeug"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Spielzeuggeschäft bearbeiten"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Videoverleih"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Videogeschäft bearbeiten"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Chemische Reinigung"
@@ -21896,9 +22263,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Chemische Reinigung bearbeiten"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Waschsalon"
@@ -21906,9 +22273,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Waschsalon bearbeiten"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Camping (Outdoor)"
@@ -21916,28 +22283,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Sportgeschäft bearbeiten"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Optiker bearbeiten"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Geld"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Bank"
@@ -21945,14 +22312,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Bank bearbeiten"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Geldautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Wechselstube"
@@ -21960,5 +22327,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Wechselstube bearbeiten"
@@ -21966,15 +22333,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomat bearbeiten"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Gesundheit"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Arzt"
@@ -21982,18 +22349,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Arzt bearbeiten"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Zahnarzt"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Zahnarzt bearbeiten"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Apotheke"
@@ -22001,5 +22368,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Apotheke bearbeiten"
@@ -22007,9 +22374,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Rezepteinlösung"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Krankenhaus"
@@ -22017,10 +22384,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Krankenhaus bearbeiten"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -22029,5 +22396,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Notfallrettungspunkt bearbeiten"
@@ -22036,20 +22403,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Punktname"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -22057,5 +22424,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -22064,59 +22431,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Tierarzt bearbeiten"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr "Geografie"
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Orte"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Kontinent bearbeiten"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Staat"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Bundesland"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Landkreis"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
@@ -22124,15 +22496,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Großstadt"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Stadt"
@@ -22140,10 +22512,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Stadt bearbeiten"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Stadtteil"
@@ -22151,25 +22523,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Stadtteil bearbeiten"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Dorf"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Weiler"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
@@ -22177,5 +22549,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Unbewohnter Ort"
@@ -22183,10 +22555,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Unbewohnten Ort bearbeiten"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Insel"
@@ -22194,10 +22566,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Insel bearbeiten"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr "Kleine Insel"
@@ -22205,5 +22577,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr "Kleine Insel bearbeiten"
@@ -22211,5 +22583,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Höhleneingang"
@@ -22217,10 +22589,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Höhleneingang bearbeiten"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Bergspitze"
@@ -22228,10 +22600,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Bergspitze bearbeiten"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Gletscher"
@@ -22239,10 +22611,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Gletscher bearbeiten"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Vulkan"
@@ -22250,70 +22622,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Vulkan bearbeiten"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Staat"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Staatsgrenze bearbeiten"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Innerstaatlich"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Innerstaatliche Grenze bearbeiten"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Zivil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Zivilrechtliche Grenze bearbeiten"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Politisch"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Politische Grenze bearbeiten"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Nationalparkgrenze bearbeiten"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Baum"
@@ -22322,15 +22694,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Baum bearbeiten"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Botanischer Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Naturwald"
@@ -22339,5 +22711,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Naturwald bearbeiten"
@@ -22345,17 +22717,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "Nadelwald"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "Laubwald"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "Mischwald"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Forst"
@@ -22364,14 +22736,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Forst bearbeiten"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Naturdenkmal oder Reservat bearbeiten"
@@ -22379,25 +22751,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Geröll"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Geröll bearbeiten"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Buschland"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Buschland bearbeiten"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Gebirge"
@@ -22405,10 +22777,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Gebirge bearbeiten"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Heide"
@@ -22416,5 +22788,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Heide bearbeiten"
@@ -22422,5 +22794,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -22429,45 +22801,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Bauernhof bearbeiten"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
@@ -22475,25 +22847,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Garten"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -22501,10 +22873,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Dorfanger bearbeiten"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -22512,20 +22884,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Öffentlichen Bereich bearbeiten"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Park bearbeiten"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -22533,5 +22905,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Erholungsgebiet bearbeiten"
@@ -22539,15 +22911,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -22555,9 +22927,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Kleinen Friedhof bearbeiten"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -22565,39 +22937,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Friedhof bearbeiten"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -22605,15 +22977,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Militärgebiet"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Militärgebiet bearbeiten"
@@ -22621,55 +22993,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Baustellengebiet"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Baustelle bearbeiten"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -22679,5 +23051,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Ein Multipolygon bearbeiten"
@@ -22686,10 +23058,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "Äußeres Segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -22697,5 +23069,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -22704,5 +23076,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Abbiegeeinschränkung bearbeiten"
@@ -22710,34 +23082,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Einschränkung"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -22746,15 +23118,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "Zu Weg"
@@ -22762,5 +23134,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Route"
@@ -22769,5 +23141,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Route bearbeiten"
@@ -22775,5 +23147,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Routentyp"
@@ -22845,5 +23217,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22852,17 +23224,17 @@
 msgstr "Fahrrad"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "Ski"
@@ -22915,5 +23287,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22922,13 +23294,13 @@
 msgstr "Fuß"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "Wandern"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "Umleitung"
@@ -22942,10 +23314,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "U-Bahn"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -22953,31 +23325,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Netzwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr "Routenstatus"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "Verbindung"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -22986,30 +23358,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
@@ -23447,11 +23819,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "veraltet"
@@ -25475,5 +25847,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "Wasser (hell)"
@@ -26145,4 +26517,12 @@
 #.
 #. <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"/>
@@ -26167,5 +26547,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "Historisch"
@@ -26179,5 +26559,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "Steinbruch"
@@ -26191,5 +26571,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "Mülldeponie"
@@ -26211,5 +26591,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "Wasserbecken"
@@ -26223,5 +26603,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "Forst"
@@ -26235,5 +26615,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "Farmland"
@@ -26256,5 +26636,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "Einkaufsbereich"
@@ -26268,5 +26648,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "Industriegebiet"
@@ -26280,5 +26660,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "Baulücke"
@@ -26292,5 +26672,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "Bauland"
@@ -26304,5 +26684,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "Eisenbahnland"
@@ -26359,7 +26739,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "Militär"
@@ -26373,5 +26753,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "Friedhof"
@@ -26384,5 +26764,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "Berggipfel"
@@ -26397,5 +26777,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "Gletscher"
@@ -26409,5 +26789,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "Vulkan"
@@ -26462,8 +26842,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "Natur"
@@ -26477,5 +26857,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "Buschland"
@@ -26489,5 +26869,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "Heide"
@@ -26501,5 +26881,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3383
 msgid "woodarea"
 msgstr "Waldfläche"
@@ -26513,5 +26893,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "Schlick & Moor"
@@ -26525,5 +26905,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "Strand"
@@ -26601,8 +26981,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "Route"
@@ -26650,7 +27030,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "Grenze"
@@ -26800,11 +27180,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "Ort"
@@ -26852,6 +27232,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "Adresse"
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 18273)
+++ applications/editors/josm/i18n/po/el.po	(revision 18508)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-09-22 14:35+0000\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-30 11:21+0000\n"
 "Last-Translator: logictheo <towardsoss@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Δημιουργία κύριου GUI"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Αγνοήθηκε κακοσχηματισμένο URL:\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Προειδοποίηση"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Σφάλμα"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "ΆΓΝΩΣΤΟ"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Περί"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Εμφάνιση του παραθύρου περί"
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Έκδοση {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../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:141
+#: ../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:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Ιστοσελίδα"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Αναφορές σφαλμάτων"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Πληροφορίες"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Διάβασέμε"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Αναθεώρηση"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Συνεισφορά"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Άδεια χρήσης"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Πρόσθετα"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Περί του JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Το αρχείο δεν βρέθηκε."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -318,42 +301,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -361,5 +343,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -372,19 +354,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Συγχώνευση"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -393,50 +375,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Προσθήκη Κόμβου..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Προσθήκη κόμβου με εισαγωγή γεωγραφικού πλάτους και μήκους."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Επεξεργασία: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Εισάγετε τις συντεταγμένες για τον νέο κόμβο."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Χρησιμοποιήστε δεκαδικές μοίρες"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Αρνητικές τιμές υποδεικνείουν  Δυτικό/Νότιο ημισφαίριο."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -445,5 +427,5 @@
 msgstr "Γεωγραφικό πλάτος"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -452,27 +434,27 @@
 msgstr "Γεωγραφικό μήκος"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../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:36
+#: ../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:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -482,5 +464,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -496,30 +478,28 @@
 msgstr "Εργαλείο: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../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:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -529,84 +509,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../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:32
+#: ../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:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "δεδομένα"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "επίπεδο"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "σύγκρουση"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "λήψη"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Ζουμ στο {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Ζουμ στο {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Προβολή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Δεν υπάρχει επιλογή στην οποία να γίνει ζουμ."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Καμοία διένεξη για να γίνει ζουμ"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -614,37 +594,37 @@
 msgstr "Αρχείο: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../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:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Αλλαγή κατευθήνσεων;"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Αντισροφή και Συνδυασμός"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -652,5 +632,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -658,41 +638,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Ένωσε {0} δρόμους"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Αντιγραφή επιλεγμένων αντικειμένων στο πρόχειρο."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Δημιουργλια Κύκλου"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Δημιουργία κύκλου από τρείς επιλεγμένους κόμβους."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -700,16 +680,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -721,5 +699,5 @@
 msgstr "Διαγραφή"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Διαγραφή επιλεγμένων αντικειμένων."
@@ -727,6 +705,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -740,74 +718,51 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../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:30
+#: ../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:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Λήψη από το OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Λήψη δεδομένων χάρτη από τον διακομιστή του OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Λήψη"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "Εντάξει"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία εργασία για λήψη"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -816,39 +771,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Αντιγραφή"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Αντιγραφή επιλογής με αντιγραφή και άμεση επικόλληση."
@@ -858,41 +813,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Έξοδος από την εφαρμογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Εξαγωγή σε GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Εξαγωγή των δεδομένων σε αρχείο GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Τίποτα προς εξαγωγή. Λάβετε κάποια δεδομένα πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -931,6 +886,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -949,9 +904,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -971,5 +926,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -977,36 +932,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../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:29
+#: ../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:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Ένωση Κόμβου και Γραμμής"
@@ -1016,168 +971,186 @@
 msgstr "Καμοία συντόμευση"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Συγχώνευση Κόμβων"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Συγχώνευση κόμβων στον παλαιότερο."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Διακοπή..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Συγχώνευση {0} κόμβων"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../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:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../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:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "επάνω"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Μετακίνηση αντικειμένων {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "κάτω"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "αριστερά"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "δεξιά"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Μετακίνηση {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Μεταφέρει αντικείμενα {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Δεν μπορείτε να μετακινήσετε αντικείμενα εκτός κόσμου."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Νέα"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Δημιοθργία καινούργιου χάρτη"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Άνοιγμα..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Άνοιγμα αρχείου."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Άνοιγμα URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Ξεχωριστό Επίπεδο"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Εισάγετε URL προς λήψη:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Προορισμός Λήψης"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Λήψη URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Λήψη δεδομένων"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Ορθογωνισμός Σχήματος"
@@ -1187,18 +1160,18 @@
 msgstr "Μετακίνηση κόμβων ώστε όλες οι γωνίες να είναι 90 ή 270 μοίρες"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1207,9 +1180,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1218,36 +1191,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Ορθογωνισμός"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Επικόληση περιεχομένων πρόχειρου."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../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:32
+#: ../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:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1256,5 +1230,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1263,59 +1237,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Προτιμήσεις..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Άνοιξε τις προτιμήσεις για μια σελίδα για παγκόσμιες ρυθμίσεις."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Επανάληψη της τελευταίας αναίρεσης."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Επιπλέον μετονομασία του αρχείου"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1323,10 +1297,10 @@
 msgstr "Αποθήκευση"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Αποθήκευση τεχόντων δεδομένων."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1375,21 +1349,21 @@
 msgstr "Αποθήκευση Επιπέδου"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Αποθήκευση ως..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Αποθήκευση τρεχόντων δεδομένων σε νέο αρχείο."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Επιλογή Όλων"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1397,10 +1371,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Προβολή Αναφοράς Κατάστασης"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1408,19 +1382,19 @@
 "επισυναφθούν σε σφάλματα"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Βοήθεια: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Αναφορά Κατάστασης"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Αντιγραφή στο πρόχειρο και κλείσιμο"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1429,18 +1403,18 @@
 msgstr "Κλείσιμο"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για διαίρεση."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1448,5 +1422,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1462,9 +1436,9 @@
 "επιλέξατε. Παρακαλώ επιλέξτε και τον δρόμο."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1472,10 +1446,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1500,65 +1474,65 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../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:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Αυτός ο κόμβος δεν είναι κολλημένος σε τίποτε άλλο."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Κανείς από αυτούς τούς κόμβους δεν είναι κολλημένος σε τίποτε άλλο."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Η τρέχουσα επιλογή δεν μπορεί να χρησιμοποιηθεί για ξεκόλημα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Επιλέξτε οποιοδήποτε:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Ένας κόμβος με ετικέτα, ή"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Ένας κόμβος που χρησιμοποιείται από παραπάνω από έναν δρόμο, ή"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 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:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 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:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1567,5 +1541,5 @@
 "χρησιμοποιούνται από περισσότερο από έναν δρόμο."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1575,9 +1549,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Ξεκολημένος Κόμβος"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1585,80 +1559,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Αντιγραφή {0} κόμβων σε {1} κόμβους"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Αναίρεση της τελευταίας ενέργειας."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Αποεπιλογή όλων"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Αποεπιλογή όλων των αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+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:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Ενημέρωση Επιλογής"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Κενή επιλογή"
@@ -1670,8 +1645,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1680,5 +1655,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1686,29 +1661,29 @@
 msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1722,11 +1697,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1737,5 +1712,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1745,23 +1720,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Επίλυση σύγκρουσης"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1772,49 +1746,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
+msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
+msgid "Updating primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr ""
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
 #, fuzzy, java-format
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Προειδοποίηση: η επικεφαλίδα σφάλματος \"{0}\" δεν συμπίπτει με τo "
-"αναμενόμενο πρότυπο \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Η αποστολή στο OSM API απέτυχε"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
-msgid "Updating primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
-#, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr ""
-
-#. we tried to delete an already deleted primitive.
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+msgid "Uploading {0} objects ..."
+msgstr "Αλλαγή {0} αντικειμένου"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1833,11 +1810,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Μεγέθυνση"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Σμίκρυνση"
@@ -1917,21 +1894,17 @@
 msgstr "Πιο αργά μπροστά"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Λήψη δεδομένων GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Λήψη Δεδομένων GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Ακατέργαστα δεδομένα GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Λήψη δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1939,27 +1912,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Δεδομένα OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../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:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Σφάλματα κατά την λήψη"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "ορατό (στον διακομιστή)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Παράβλεψη"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1971,7 +1955,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Σφάλματα κατά την λήψη"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Σφάλματα κατά την λήψη"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1993,5 +1992,5 @@
 msgstr "Κατάσταση: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2019,38 +2018,38 @@
 msgstr "επιλεγμένο"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 msgid "Add node"
 msgstr "Προσθήκη κόμβου"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Δημιοθργία νέου κόμβου."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Επιλογή κόμβου στο σημείο του κέρσορα."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2059,14 +2058,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Τέλος σχεδιασμού."
@@ -2086,5 +2085,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2099,5 +2098,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή"
@@ -2157,5 +2156,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2164,5 +2163,5 @@
 "συγχώνευση με το πλησιέστερο κόμβο."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2172,4 +2171,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Ζουμ"
@@ -2189,5 +2189,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Αναζήτηση..."
@@ -2288,42 +2287,48 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - όλα τα αλλαγμένα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - όλα τα επιλεγμένα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - όλα τα ημιτελή αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - όλα τα αντικείμενα χωρίς ετικέτες"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2333,51 +2338,51 @@
 msgstr "Φίλτρο"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Έναρξη αναζήτησης"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Δεν βρέθηκε αποτέλεσμα για ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Τίποτα δεν αφαιρέθηκε από την επιλογή ψάχνοντας για \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Βρέθηκαν {0} αποτελέσματα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2405,26 +2410,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Αναμενόταν κλείσιμο παρένθεσης."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2433,5 +2449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2528,4 +2544,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "Εντάξει"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2543,8 +2575,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Αλλαγή {0} αντικειμένου"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2625,5 +2657,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2659,4 +2691,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2687,29 +2730,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Αντικρουόμενη σχέση"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Διαγραφή από σχέση"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr ""
@@ -2717,6 +2737,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2728,5 +2748,5 @@
 "μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2910,15 +2930,30 @@
 msgstr "Αυτόματη διόρθωση ετικέτας"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Η προεπιλεγμένη τιμή είναι \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2927,5 +2962,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2934,5 +2969,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2941,5 +2976,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2948,5 +2983,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2954,5 +2989,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2961,5 +2996,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2968,5 +3003,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2975,5 +3010,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2982,19 +3017,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Οι προτιμήσεις αποθηκεύθηκαν στο {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Αδυναμία αποστολής προτιμήσεων. Λόγος: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Αδυναμία φόρτωσης προτιμήσεων από διακομηστή"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3003,5 +3061,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "ΆΓΝΩΣΤΟ"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3023,20 +3101,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "Ν"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "Β"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "Δ"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "Α"
@@ -3047,4 +3125,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3112,14 +3204,14 @@
 msgstr "Προειδοποίηση: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3127,5 +3219,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3152,6 +3244,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3211,113 +3303,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης."
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#, java-format
+msgid "Way ''{0}'' with less than two points."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+msgid "More than one \"from\" way found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
-#, java-format
-msgid "Way ''{0}'' with less than two points."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
-msgid "More than one \"from\" way found."
+msgid "More than one \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+msgid "More than one \"via\" found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-msgid "More than one \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
-msgid "More than one \"via\" found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Άγνωστος ρόλος \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Οδός \"από\" δεν βρέθηκε."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
-#, java-format
-msgid "No useful role ''{0}'' for Way ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
-#, java-format
-msgid "Non-Way ''{0}'' in multipolygon."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
-#, java-format
-msgid "No outer way for multipolygon ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
+#, java-format
+msgid "No useful role ''{0}'' for Way ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#, java-format
+msgid "Non-Way ''{0}'' in multipolygon."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
+#, java-format
+msgid "No outer way for multipolygon ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3333,11 +3425,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "κείμενο"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3353,5 +3444,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3362,5 +3452,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3389,5 +3478,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "φόντο"
@@ -3421,12 +3510,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Ζώνη Labert (Γαλλία)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Ζώνη Labert (Γαλλία)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3462,10 +3549,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3494,5 +3581,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "σιδηρόδρομος"
@@ -3509,4 +3596,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3522,33 +3611,33 @@
 msgstr[1] "{0} μέλη"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3556,16 +3645,16 @@
 msgstr "Διένεξη"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Άγνωστος υπολογιστής"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3578,4 +3667,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Λήψη \"Μηνύματος Ημέρας\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Κλείσιμο του διαλόγου"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3641,74 +3735,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Κωδικός"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "χρήση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "Επιλογές"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Εμφάνιση αυτής της βοήθειας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Άνοιγμα αρχείου (ως ακατέργαστο gps, αν είναι .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Επιλογή με την δοθείσα αναζήτηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Ρυθμίστε την γλώσσα."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3717,9 +3811,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "παραδείγματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3730,26 +3824,26 @@
 "ότι φορτώσατε δεδομένα πριν το --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 "Αντί για το --download=<bbox> μπορείτε να καθορίσεται το osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Ενεργοποίηση ενημερωμένων πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Ρύθμιση προκαθορισμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Φόρτωση πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3762,11 +3856,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3791,6 +3885,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3891,25 +3985,22 @@
 msgstr "(κανένα αντικείμενο)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "το επίπεδο δεν είναι στη λίστα."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Το αρχείο δεν βρέθηκε"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Όχι, ακύρωση της λειτουργίας"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3930,5 +4021,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3957,24 +4048,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Αλλαγή {0} αντικειμένου"
-msgstr[1] "Αλλαγή {0} αντικειμένων"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Διαγραφή επιλεγμένων αντικειμένων."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "μη διεγραμένο"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Σχέση"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -3986,5 +4074,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4033,5 +4121,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4048,5 +4136,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4248,8 +4336,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4557,6 +4645,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4570,6 +4658,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4627,36 +4715,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4668,5 +4756,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "όλα"
@@ -4756,4 +4844,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4764,4 +4854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4775,49 +4866,82 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4854,6 +4978,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4942,10 +5066,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5012,5 +5133,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5055,4 +5177,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5078,6 +5201,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5086,22 +5209,22 @@
 msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Κενή τιμή διαγράφει το κλειδί."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<διαφορετικά>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Αλλαγή τιμών;"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5110,70 +5233,74 @@
 msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Παρακαλώ επιλέξτε κλειδί"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Παρακαλώ επιλέξτε μια τιμή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Ιδιότητες/Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Ιδιότητες επιλεγμένων αντικειμένων."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Μέλος του"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Προσθήκη Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Επεξεργασία Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit the value of the selected key for all objects"
 msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Ιδιότητες / Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Αλλαγή σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Διαγραφή από σχέση"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Διαγραφή Ιδιοτήτων"
@@ -5181,40 +5308,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Σχέσεις"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Άνοιγμα λίστας όλων τον σχέσεων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Σχέσεις: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Διαγραφή της επιλεγμένης σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Σημιουργία νέας σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Διαγραφή της επιλεγμένης σχέσης"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Επιλέξτε οποιοδήποτε:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Διαγραφή της επιλεγμένης σχέσης"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Λήψη μελών"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5241,5 +5388,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5251,9 +5398,9 @@
 msgstr "Επιλογή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5262,5 +5409,5 @@
 "αριστερή εργαλειοθήκη."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -5343,5 +5490,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5371,23 +5519,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5396,14 +5544,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5413,9 +5561,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5425,15 +5573,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5441,5 +5589,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5447,20 +5595,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5469,67 +5617,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Μετακίνηση των επιλεγμένων μελών κάτω"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Εφαρμογή επίλυσης συγκρούσεων και κλείσιμο του διαλόγου"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5538,9 +5685,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5549,41 +5696,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Λήψη μελών"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5593,17 +5740,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5614,13 +5761,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5634,14 +5781,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5691,58 +5838,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Χωρίς σύνδεση"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Σελιδοδείκτες"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "ΠΑρακλώ εισάγετε τις επιθυμητές συντεταγένες πρώτα."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Δημιουργία ορίου"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Μετακίνηση των επιλεγμένων μελών κάτω"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "ΠΑρακαλώ εισάγετε ένα όνομα για την τοποθεσία."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Επιλέξτε ένα σελιδοδείκτη πρώτα."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "ελαχ. γ. πλάτος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "ελαχ. γ. μήκος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "μεγ. γ. πλάτος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "μεγ. γ. μήκος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5752,22 +5929,72 @@
 "για να κατεβάσετε μια περιοχή)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Πηγές και Τύποι δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Δεδομένα OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+msgid "Select to download OSM data in the selected download area."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Ακατέργαστα δεδομένα GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+msgid "Select to download GPS traces in the selected download area."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Λήψη σαν νέο επίπεδο"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Λήψη Περιοχής"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Λήψη"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Δεν επιλέχθηκε ίχνος GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5775,336 +6002,63 @@
 "διακομιστή"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
 "Η περιοχή λήψης είναι εντάξει, μέγεθος πιθανότατα αποδεκτό από διακομιστή"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+msgid "Enter a place name to search for"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Εισαγωγή ακολουθίας προς αναζήτηση"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr ""
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr ""
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Τοποθεσίες"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "τύπος"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "κοντά"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "ζουμ"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Slippy map"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "Επίπεδο ζουμ"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x από"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "εώς"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y από"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Αριθμοί πλακιδίων"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Κλείσιμο του διαλόγου"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Φόρτωση ιστορικού"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Κόμβος {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Αναζήτηση..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Κατεύθυνση για αναζήτηση ξηράς"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6462,4 +6416,6 @@
 #. 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" />
@@ -6840,6 +6796,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6905,11 +6862,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6919,6 +6876,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6928,79 +6885,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Τύπος"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "κοντά"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Slippy map"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "Επίπεδο ζουμ"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x από"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "εώς"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y από"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Αριθμοί πλακιδίων"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Κλείσιμο του διαλόγου"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Φόρτωση ιστορικού"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Κόμβος {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Χρήστης"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7081,4 +7305,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7370,9 +7595,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Αντικείμενα που θα αλλαχτούν"
+msgstr[1] "Αντικείμενα που θα αλλαχτούν"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7468,5 +7693,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7496,59 +7730,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Εικόνες για {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Ανάγνωση GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Δεν υπάρχει ώρα για το σημείο {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Αδύνατη η ανάγνωση ώρας \"{0}\" από το σημείο {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Ανάγνωση {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Δεν βρέθηκαν εικόνες με αναγνώσιμη χρονοσήμανση."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Ανάγνωση {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Αρχή GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Τέλος GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "τρέχουσα διαφορά: {0} δευτερόλεπτα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "διαφορά στη ζώνη ώρας: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7556,51 +7790,51 @@
 msgstr[1] "εικόνες"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} μέσα στο ίχνος"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Συγχρονισμός ρολογιού"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Εικόνες JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Η ημερομηνία στο αρχείο \"{0}\" δεν μπόρεσε να ερμηνευθεί."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Δεν υπάρχει ώρα EXIF μέσα στο αρχείο \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Εικόνα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "ζώνη ώρας της συσκευής GPS (διαφορά από την φωτογραφία)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Συγχρονισμός Ώρας με τη μονάδα GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7608,30 +7842,30 @@
 msgstr "σημείο gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Προσαρμογή του σχεδιασμού γραμμών"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Χρηση καθολικών ρυθμίσεων."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7639,5 +7873,5 @@
 msgstr "Προσαρμογή Χρώματος"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7646,5 +7880,5 @@
 msgstr "Προκαθορισμένο"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7653,43 +7887,43 @@
 msgstr "Επιλέξτε ένα χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Σημάδια από Ονομασμένα Σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Εισαγωγή Ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Αρχεία Κυματομορφής (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Σημάδια ήχου από {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Εισαγωγή εικόνων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Όνομα: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Περιγραφή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7699,28 +7933,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Μήκος: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7729,5 +7963,5 @@
 msgstr[1] "{0} διαδρομές, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7736,10 +7970,10 @@
 msgstr[1] "{0} σημεία αναφοράς"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Μετατροπή σε επίπεδο δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7749,11 +7983,11 @@
 "βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7763,29 +7997,29 @@
 msgstr "Μετατράπηκε από: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Λήψη όλων εντός:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} μέτρα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Μέγιστη περιοχή ανά αίτημα:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} τετρ. χλμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7796,14 +8030,10 @@
 "συνεχίσετε;</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 "Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7811,5 +8041,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7817,23 +8047,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Επίπεδο Δεδομένων {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "εκτός περιοχής λήψης"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "έκδοση {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7842,39 +8072,55 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} διαγράφηκαν.)"
+msgstr[1] " ({0} διαγράφηκαν.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "το {0} αποτελείται από:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} διαγράφηκαν.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "Έκδοση API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8043,6 +8289,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8057,6 +8301,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8228,5 +8470,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8556,20 +8798,19 @@
 msgstr "Γλώσσα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Ενεργοποίηση ενσωματωμένων προεπιλογών"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8584,6 +8825,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Ενημέρωση"
@@ -8735,68 +8975,107 @@
 msgstr "Συντόμευση"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Διαγραφή της επιλεγμένης πηγής από την λίστα."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr ""
+"Αφαίρεση των επιλεγμένων εγγραφών από την λίστα συγχωνευμένων στοιχείων"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+"Αφαίρεση των επιλεγμένων εγγραφών από την λίστα συγχωνευμένων στοιχείων"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Προσθήκη νέου επιπέδου"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Ανανέωση της λίστας επιλεγμένων."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Επιξεργασία της επιλεγμένης πηγής."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, 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}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Ταξινόμηση μενού προεπιλογών"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8979,5 +9258,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Περισότερες πληροφορίες για αυτό το χαρακτηριστικό"
@@ -9042,16 +9321,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Ομάδα προεπιλογών \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Ομάδα προεπιλογών \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9059,5 +9338,5 @@
 msgstr "Επικοινωνία με τον διακομιστή OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9168,5 +9447,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -9305,5 +9584,5 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr ""
+msgstr "Με επιτυχία άνοιξε το changeset {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
@@ -9392,5 +9671,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9417,5 +9696,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9423,5 +9702,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9434,5 +9713,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9443,33 +9722,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Λανθασμένος κωδικός ή όνομα χρήστη"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Προειδοποίηση: Ο κωδικός μεταδίδεται χωρίς κρυπτογράφηση"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Αποθήκευση χρήστη και κωδικού (χωρίς κρυπτογράφηση)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Εισάγετε κωδικό"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Είσοδος"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Η βασική URL για τον διακομιστή OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9478,17 +9757,17 @@
 "κωδικός."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Η βασική URL για τον διακομιστή"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "Όνομα χρήστη OSM (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "Κωδικός OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9585,5 +9864,5 @@
 msgstr "Το αρχείο \"{0}\" δεν υπάρχει"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9592,38 +9871,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9631,19 +9910,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Άγνωστο αντικείμενο με id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9652,7 +9931,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9662,25 +9945,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9688,5 +9971,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9695,5 +9978,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9701,5 +9984,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9708,13 +9991,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Προετοιμασία δεδομένων OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9725,14 +10008,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Λήψη από το OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9845,15 +10127,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Ενημέρωση πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Λήψη Πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9866,30 +10148,34 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "{0} πρόσθετο φορτώθηκε με επιτυχία. Παρακαλώ επανεκκινήστε το JOSM."
 msgstr[1] ""
 "{0} πρόσθετα φορτώθηκαν με επιτυχία. Παρακαλώ επανεκκινήστε το JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Λήψη πρόσθετου {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Λήψη Πρόσθετου"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Παράλειψη Λήψης"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9901,10 +10187,10 @@
 msgstr "Συνέβη σφάλμα στο πρόσθετο {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9914,34 +10200,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Τελευταία ενημέρωση πρόσθετου παραπάνω από {0} μέρες πριν."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Ενημέρωση πρόσθετων"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Το πρόσθετο {0} είναι απαραίτητο από το πρόσθετο {1} αλλά δεν βρέθηκε."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Δεν βρέθηκε το πρόσθετο: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Τελευταία ενημέρωση πρόσθετου παραπάνω από {0} μέρες πριν."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Μπορείτε να αλλάξετε τις μέρες έπειτα από τις οποίες αυτή η προειδοποίηση "
-"εμφανίζεται <br>θέτωντας την επιλογή 'pluginmanager.warntime' στην "
-"διαμόρφωση.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
@@ -9949,16 +10243,16 @@
 "Δεν ήταν δυνατή η φόρτωση του πρόσθετου {0}. Διαγραφή από τις προτιμήσεις;"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Απενεργοποίηση πρόσθετου"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Διατήρηση πρόσθετου"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9968,9 +10262,9 @@
 "άδεια αντικατάστασης των υπαρχόντων."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9980,10 +10274,10 @@
 "''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Σώμφωνα με τις πληροφορίες του πρόσθετου, ο συγγραφέας είναι{0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9992,9 +10286,9 @@
 "κάντε αναφορά για bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Να απενεργοποιηθεί το πρόσθετο;"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10004,22 +10298,22 @@
 "να αποφορτωθεί το πρόσθετο."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "δεν υπάρχει περιγραφή"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Περισσότερες λεπτομέρειες"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10028,18 +10322,18 @@
 msgstr[1] "Έγινε λήψη πληροφοριών πρόσθετων από {0} τοποθεσίες"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Δεν βρέθηκαν πληροφορίες πρόσθετων."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Όλα τα εγκατεστημένα πρόσθετα είναι ενημεωμένα."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10052,9 +10346,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Λήψη πρόσθετων που λείπουν"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10069,9 +10363,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10093,19 +10387,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Έκδοση {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Πρόσθετα που έρχονται με το JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10171,5 +10465,5 @@
 msgstr "(Το κείμενο έχει ήδη αντιγραφεί στο πρόχειρο σας.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10178,5 +10472,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10185,5 +10479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10193,5 +10487,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10201,10 +10495,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10213,5 +10507,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10220,16 +10514,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10239,5 +10533,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10246,5 +10540,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10253,5 +10547,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10260,10 +10554,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10272,10 +10566,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10286,5 +10580,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10294,5 +10588,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10303,5 +10597,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10404,11 +10698,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10551,5 +10838,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Παρεμβολή Διευθύνσεων"
@@ -10565,10 +10853,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Μονά"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10576,103 +10864,103 @@
 msgstr "Ζυγά"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10726,46 +11014,47 @@
 "{0} χμ/ω"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Εξαγωγή τοποθεσιών GPS από EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Έναρξη σάρωσης καταλόγου"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Ένα από τα επιλεγμένα αρχεία ήταν μηδενικό !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Ανάγνωση φωτογραφιών"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Σάρωση καταλόγου {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11019,5 +11308,5 @@
 msgstr "Σφάλμα στο αρχείο {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11030,10 +11319,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11081,13 +11370,13 @@
 msgstr "Επιλέξτε από..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11096,13 +11385,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11213,7 +11502,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Εμφάνιση συντεταγένων ως"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11232,5 +11520,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11271,13 +11559,13 @@
 msgstr "Δημιουργία ορίου"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11408,22 +11696,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Αλλαγή θέσης"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Ρύθμιση νέας θέσης για την επόμενη αίτηση"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Προσθήκη νέου επιπέδου"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Θέση"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11431,5 +11719,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Προσθήκη νέου επιπέδου"
@@ -11443,9 +11731,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11465,9 +11753,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "Ρύθμιση της θέσης του επιλεγμένου επιπέδου WMS"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11491,5 +11778,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Άδειο επίπεδο"
@@ -11518,5 +11805,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11525,18 +11812,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11631,5 +11918,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Δε φορτώθηκαν δεδομένα."
@@ -12035,7 +12322,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "νερό"
@@ -12244,11 +12531,11 @@
 msgstr "Επίπεδο LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
@@ -12256,22 +12543,22 @@
 "LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Κεντράρισμα μία φορά"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Αυτόματο Κεντράρισμα"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Κεντράρισμα του επιπέδου LiveGPS στην τρέχουσα θέση συνεχώς."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12360,24 +12647,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12527,4 +12814,9 @@
 msgstr "εκτελέσιμο Firefox"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Επίπεδο"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12570,30 +12862,30 @@
 msgstr "Επιτρεπώμενες ενέργειες"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Θέλετε να το επιτρέψετε;"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
+msgid "Confirm Remote Control action"
+msgstr ""
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-msgid "Confirm Remote Control action"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12612,7 +12904,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12621,4 +12911,5 @@
 #: ../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 ""
@@ -12640,25 +12931,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Καθαρισμός διαδρομής"
@@ -12688,93 +12979,87 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Αυτόματο ζουμ: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Φόρτωση πλακιδίου"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
 msgstr "Εμφάνιση κατάστασης πλακιδίου"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Αίτηση  Ενημέρωσης"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Φόρτωση όλων των πλακιδίων"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Άυξηση ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Μείωση ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "αυτόματο ζουμ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Ρυθμίσεις για το πρόσθετο SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Πηγές Πλακιδίων"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Αυτόματο ζουμ: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Αυτόματη φόρτωση Πλακιδίων: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Μέγιστο επίπεδο ζούμ: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Μέγιστο επίπεδο ζούμ: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "ζητήθηκαν: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "Σφάλμα κατά την αίτηση ενημέρωσης"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -12787,5 +13072,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12947,5 +13232,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Όνομα οδού"
@@ -12989,29 +13274,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "Δεν βρέθηκε διασταύρωση. Τίποτα δεν αλλάχθηκε."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Προστέθηκε κόμβος σε όλες τις διασταυρώσεις"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Δίορθωση σχέσεων"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13019,33 +13304,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Εισάγετε τιμές για όλες τισ διενέξεις."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Επίλυση διενέξεων"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Διόρθωση συγκρούσεων ετικετών"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13116,5 +13401,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:83
 msgid "Validation errors"
-msgstr "Σφάματα επαλήθευσης"
+msgstr "Σφάλματα επαλήθευσης"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:90
@@ -13252,8 +13537,4 @@
 msgstr "Διόρθωση των επιλεγμένων σφαλμάτων."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Παράβλεψη"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13298,24 +13579,23 @@
 msgstr "Αντικατάσταση \"{0}\" με \"{1}\" για"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Ακτογραμμές."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Αυτή η δοκιμή ελέγχει ότι οι ακτογραμμές είναι σωστές."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "ακτογραμμή"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "Αναστροφή διαδρομής"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13338,18 +13618,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13592,4 +13872,8 @@
 msgstr "Επιξεργασία της επιλεγμένης πηγής."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Διαγραφή της επιλεγμένης πηγής από την λίστα."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13804,7 +14088,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "κτίριο"
@@ -13818,5 +14102,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr ""
@@ -13826,25 +14110,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr ""
@@ -13914,5 +14198,5 @@
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
-msgstr ""
+msgstr "Σαρωμένος Χάρτης..."
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
@@ -13934,23 +14218,28 @@
 #, java-format
 msgid "Walking Papers: {0}"
-msgstr ""
-
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+msgstr "Χαρτιά που περπατάνε: {0}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "Χαρτιά που περπατάνε: {0}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr ""
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr "Χαρτιά που περπατάνε"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14184,9 +14473,9 @@
 msgstr "Σφάλμα μορφής αρχείου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Άνοιγμα ενός κενού επιπέδου WMS για φόρτωση δεδομένων από ένα αρχείο"
@@ -14517,4 +14806,7 @@
 "plugin is still under early development and may be buggy."
 msgstr ""
+"Υποστιρίζει να κατεβάζει tiled, σαρωμένους χάρτες από το walking-papers.org. "
+"Αυτό το πρόσθετο είναι ακόμα σε πειραματικό στάδιο ανάπτυξης και μπορεί να "
+"έχει bugs."
 
 #. Plugin waydownloader
@@ -14636,6 +14928,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr ""
@@ -15197,5 +15489,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15207,5 +15499,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "άλσος"
@@ -15493,7 +15785,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "ναι"
@@ -15642,8 +15934,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "όχι"
@@ -15770,31 +16062,4 @@
 msgstr ""
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Τύπος"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15915,5 +16180,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "Οικιστική"
@@ -15948,5 +16213,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr ""
@@ -15981,5 +16246,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr ""
@@ -16369,12 +16634,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Λειτουργός"
@@ -16587,6 +16852,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Υψόμετρο"
@@ -17013,5 +17278,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "έλος"
@@ -17544,25 +17809,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Ώρες Λειτουργείας"
@@ -17628,24 +17893,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17658,24 +17923,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17688,24 +17953,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17738,6 +18003,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Αριθμός Αναφοράς"
@@ -17753,5 +18018,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "υπόγειο"
@@ -17765,5 +18030,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Κόστος"
@@ -17999,5 +18264,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Καταφύγιο"
@@ -18465,5 +18730,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Ποδηλασία"
@@ -18478,5 +18743,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr ""
@@ -18630,16 +18895,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Αρχαιολογικός Χώρος"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Επεξεργασία Αρχαιολογικού Χώρου"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Μνημείο"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Επεξεργασία Μνημείου"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Ηρώο"
@@ -18647,55 +18925,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Επεξεργασία Ηρώου"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Αναψυχή"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Παιδική Χαρά"
@@ -18703,35 +18981,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Επεξεργασία Παιδικής Χαράς"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Ψάρεμα"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Επεξεργασία Ψαρέματος"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Αθλητικά"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Χώροι Άθλησης"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Στάδιο"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Επεξεργασία Σταδίου"
@@ -18745,6 +19023,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "επιλέξτε άθλημα:"
@@ -19136,30 +19414,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "άθληση"
@@ -19169,227 +19447,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Αθλητικό Κέντρο"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Επεξεργασία Αθλητικού Κέντρου"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Μίνι Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Επεξεργασία Μίνι Golf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Άθλημα"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Πολλαπλά"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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"
@@ -19426,203 +19757,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Τοξοβολία"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Επεξεργασία τοξοβολίας"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Αναρρήχηση"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Επεξεργασία Αναρρήχησης"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Επεξεργασία Ποδηλασίας"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Κυνοδρομίες"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Επεξεργασία Κυνοδρομιών"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Ιππικό"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Επεξεργασία Ιππικού"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Μηχανοκίνητα Αθλήματα"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Κολύμβηση"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Επεξεργασία Κολύμβησης"
@@ -19630,56 +19961,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Δυσκολία"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "αρχαρίων"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "εύκολη"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Σκοποβολή"
@@ -19687,182 +20018,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Επεξεργασία Σκοποβολής"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Ποδόσφαιρο"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Επεξεργασία Ποδοσφαίρου"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Ποδόσφαιρο"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Επεξεργασία Baseball"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Καλαθοσφαίρηση"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Επεξεργασία Καλαθοσφαίρησης"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Επεξεργασία Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Επεξεργασία Hockey"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Επεξεργασία Rugby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Επιτραπέζια Αντισφαίριση"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Αντισφαίριση"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Επεξεργασία Αντισφαίρισης"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Κτήρια"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Κτήριο"
@@ -19870,5 +20201,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Δημόσιο Κτήριο"
@@ -19876,10 +20207,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Επεξεργασία Δημοσίου Κτηρίου"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Δημαρχείο"
@@ -19887,10 +20218,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Επεξεργασία Δημαρχείου"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Πρεσβεία"
@@ -19898,10 +20229,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Επεξεργασία Πρεσβείας"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Δικαστήρια"
@@ -19910,10 +20241,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Επεξεργασία Δικαστηρίων"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Φυλακή"
@@ -19922,10 +20253,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Επεξεργασία Φυλακής"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Αστυνομία"
@@ -19935,10 +20266,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Επεξεργασία Αστυνομίας"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Πυροσβεστείο"
@@ -19947,10 +20278,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Επεξεργασία Πυροσβεστείου"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Ταχυδρομείο"
@@ -19958,5 +20289,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Επεξεργασία Ταχυδρομείου"
@@ -19964,15 +20295,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Νηπιαγωγίο"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Επεξεργασία Νηπιαγωγίου"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Σχολείο"
@@ -19980,10 +20311,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Επεξεργασία Σχολείου"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Πανεπιστήμιο"
@@ -19991,10 +20322,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Επεξεργασία Πανεπιστημίου"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Κολέγιο"
@@ -20002,5 +20333,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Επεξεργασία Κολεγίου"
@@ -20008,5 +20339,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Κινηματογράφος"
@@ -20015,10 +20346,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Επεξεργασία Κινηματογράφου"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Βιβλιοθήκη"
@@ -20027,9 +20358,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Επεξεργασία Βιβλιοθήκης"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Κέντρο Τεχνών"
@@ -20037,10 +20368,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Επεξεργασία Κέντρου Τεχνών"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Θέατρο"
@@ -20049,10 +20380,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Επεξεργασία Θεάτρου"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Τόπος Λατρείας"
@@ -20062,5 +20393,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Επεξεργασία Τόπου Λατρείας"
@@ -20069,6 +20400,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Θρησκεία"
@@ -20077,66 +20408,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "βουδισμός"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "χριστιανισμός"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "ινδουϊσμός"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "ιουδαϊσμός"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "μουσουλμανισμός"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "ταοϊσμός"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Δόγμα"
@@ -20145,81 +20476,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "αγγλικανικό"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "βαπτιστικό"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "καθολικό"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "ευαγγελικό"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "μαρτύρων του Ιεχοβά"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "λουθερανικό"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "ορθόδοξο"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "πεντηκωστής"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "προτεσταντικό"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Διευθύνσεις"
@@ -20228,5 +20559,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Επεξεργασία διεύθυνσης"
@@ -20234,5 +20565,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
@@ -20240,20 +20571,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Όνομα Σπιτιού"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Όνομα πόλης"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Ταχυδρομικός Κώδικας"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Κωδικός χώρας"
@@ -20262,5 +20593,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων"
@@ -20268,61 +20599,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Τρόπος Αρίθμησης"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "Μονά"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "Ζυγά"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Πύργος"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Επεξεργασία Πύργου"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20330,25 +20661,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Υδραγωγείο"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Επεξεργασία Υδραγωγείου"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Επεξεργασία Μετρητή Αερίου"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Φάρος"
@@ -20356,10 +20687,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Ανεμόμυλος"
@@ -20367,10 +20698,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Επεξεργασία Ανεμόμυλου"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Αγωγός"
@@ -20379,37 +20710,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Επεξεργασία Αγωγού"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "Αέριο"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Βιολογικός Καθαρισμός"
@@ -20419,10 +20750,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Επεξεργασία Βιολογικού Καθαρισμού"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Γερανός"
@@ -20430,10 +20761,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Επεξεργασία Γερανού"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Φάρος"
@@ -20441,10 +20772,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -20452,10 +20783,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Παρακολούθηση"
@@ -20463,5 +20794,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
@@ -20469,5 +20800,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Γεννήτρια Ρεύματος"
@@ -20477,35 +20808,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Επεξεργασία Γεννήτριας Ρεύματος"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "Αέρας"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "Νερό"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "Πυρηνικό"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "Λιγνίτης"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "Φωτοβολταϊκό"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Σταθμός Παραγωγής Ρεύματος"
@@ -20514,10 +20845,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Υποσταθμός Ρεύματος"
@@ -20526,5 +20857,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
@@ -20532,10 +20863,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Πυλώνας Ρεύματος"
@@ -20546,23 +20877,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Επεξεργασία Πυλώνα Ρεύματος"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Αγωγός Μεταφοράς Ρεύματος"
@@ -20571,75 +20902,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Τάση ρεύματος"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Τουαλέτες"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Σημείωση"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Γραμματοκιβώτιο"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Τηλέφωνο"
@@ -20648,5 +20979,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Επεξεργασία Τηλεφώνου"
@@ -20654,5 +20985,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Κέρματα"
@@ -20660,5 +20991,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Χαρτονομίσματα"
@@ -20666,5 +20997,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20672,5 +21003,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Χρεωστικές Κάρτεσ"
@@ -20678,15 +21009,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Πιστωτικές Κάρτες"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Τηλεκάρτες"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Ανακύκλωση"
@@ -20695,5 +21026,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
@@ -20701,35 +21032,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Μπαταρίες"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Τενεκεδάκια"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Ρούχα"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Γυαλί"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Χαρτί"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Μέταλλα"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Παγκάκι"
@@ -20738,31 +21069,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20833,40 +21164,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "χόρτο"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -20875,30 +21205,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Ύψος"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "χαμηλό"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "μισό"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "πλήρες"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Κρυψώνα"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Κλειδαριά"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Συντριβάνι"
@@ -20907,10 +21237,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Επεξεργασία Συντριβανίου"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Πόσιμο Νερό"
@@ -20919,10 +21249,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Επεξεργασία πόσιμου νερού"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Βρεφοδόχος"
@@ -20930,33 +21260,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Επεξεργασία Βρεφοδόχου"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Καταστήματα"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Επεξεργασία Supermarket"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr ""
@@ -20964,9 +21294,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Περίπτερο"
@@ -20974,27 +21304,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Επεξεργασία Περιπτέρου"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Μηχάνημα Πώλησης"
@@ -21002,5 +21332,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Επεξεργασία Μηχανήματος Πώλησης"
@@ -21008,88 +21338,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Πωλούμενα Προϊόντα"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "εισιτήρια Στάθμευσης"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "φαγητό"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "ποτά"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "γλυκά"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "τσιγάρα"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "φωτογραφίες"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "τροφές ζώων"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "εφημερίδες"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "Παιχνίδια"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "Γραμματόσημα"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "Κάρτες SIM"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "κουπόνια"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "Προφυλακτικά"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Κρεοπωλείο"
@@ -21097,9 +21427,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Επεξεργασία Κρεοπωλείου"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Φούρνος"
@@ -21107,9 +21437,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Επεξεργασία Φούρνου"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Ανθοπωλείο"
@@ -21117,18 +21447,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Επεξεργασία Ανθοπωλείου"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Βιολογικά"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Επεξεργασία Καταστήματος Βιολογικών"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21136,54 +21466,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Υπολογιστές"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Ηλεκτρονικά"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Ηχοσυστήματα"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Έπιπλα"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Επεξεργασία Καταστήματος Επίπλων"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Είδη Κήπου"
@@ -21191,9 +21521,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Σιδηρικά"
@@ -21201,9 +21531,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -21211,54 +21541,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Χαρτικά"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Επεξεργασία Χαρτοπωλείου"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Κομμωτήριο"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Επεξεργασία Κομμωτηρίου"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Υποδήματα"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Επεξεργασία Υποδηματοπωλείου"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Παιχνίδια"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Στπγνοκαθαριστήριο"
@@ -21266,9 +21596,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Πλυντήριο"
@@ -21276,9 +21606,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Επεξεργασία πλυντηρίου"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr ""
@@ -21286,28 +21616,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Επεξεργασία Καταστήματος Αθλητικών"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Μετρητά"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -21315,14 +21645,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Επεξεργασία Τράπεζας"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "ΑΤΜ"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Συναλλακτήριο"
@@ -21330,5 +21660,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Επεξεργασία Συναλλακτηρίου"
@@ -21336,15 +21666,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Επεξεργασία ΑΤΜ"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Υγεία"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Ιατροί"
@@ -21352,18 +21682,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Επεξεργασία Ιατρών"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Οδοντίατρος"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Επεξεργασία Οδοντιάτρου"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Φαρμακείο"
@@ -21371,5 +21701,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Επεξεργασία Φαρμακείου"
@@ -21377,9 +21707,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Νοσοκομείο"
@@ -21387,10 +21717,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Επεξεργασία Νοσοκομειου"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr ""
@@ -21399,5 +21729,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -21406,20 +21736,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Αριθμός Σημείου"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Αριθμός Τηλεφώνου"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
@@ -21427,5 +21757,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Κτηνιατρίο"
@@ -21434,59 +21764,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Επεξεργασία Κτηνιατρίου"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Τοποθεσίες"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Ήπειρος"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Επεξεργασία Ηπείρου"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Χώρα"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Επεξεργασία Χώρας"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Πολιτεία"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Επεξεργασία Πολιτείας"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Περιοχή"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Επεξεργασία Περιοχής"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Περιφέρεια"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Επεξεργασία Περιφέρειας"
@@ -21494,15 +21829,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Πόλη"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Επεξεργασία Πόλης"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Κωμόπολη"
@@ -21510,10 +21845,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Επεξεργασία Κωμόπολης"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Προάστιο"
@@ -21521,25 +21856,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Επεξεργασία Προαστίου"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Χωριό"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Επεξεργασία Χωριού"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr ""
@@ -21547,5 +21882,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr ""
@@ -21553,10 +21888,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Νησί"
@@ -21564,10 +21899,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Επεξεργασία Νησιού"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21575,5 +21910,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21581,5 +21916,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Είσοδος σπηλαίου"
@@ -21587,10 +21922,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Επεξεργασία εισόδου σπηλαίου"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Κορυφή"
@@ -21598,10 +21933,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Επεξεργασία κορυφής"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Παγετώνας"
@@ -21609,10 +21944,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Επεξεργασία παγετώνα"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Ηφαίστειο"
@@ -21620,70 +21955,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Επεξεργασία ηφαιστείου"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Όρια"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Εθνικό"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Επεξεργασία Εθνικού Συνόρου"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Διοικητικό"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Επεξεργασία Διοικητικού Ορίου"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Πολιτικό"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Πολιτικό"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Εθνικό πάρκο"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Χρήση γής"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Δένδρο"
@@ -21692,15 +22027,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Επεξεργασία δένδρου"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Βοτανικό όνομα"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Άλσος"
@@ -21709,5 +22044,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Επεξεργασία άλσους"
@@ -21715,17 +22050,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "Κωνοφόρο"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "φυλλοβόλα"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "Μικτό"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Δάσος"
@@ -21734,14 +22069,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Επεξεργασία Δάσους"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -21749,25 +22084,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr ""
@@ -21775,10 +22110,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr ""
@@ -21786,5 +22121,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr ""
@@ -21792,5 +22127,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr ""
@@ -21799,45 +22134,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Χωράφι"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Επεξεργασία Χωραφιού"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Αμπελώνας"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Επεξεργασία Αμπελώνα"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Κλήροι"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -21845,25 +22180,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Κήπος"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Επεξεργασία Κήπου"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Γρασίδι"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21871,10 +22206,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr ""
@@ -21882,20 +22217,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Πάρκο"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Επεξεργασία Πάρκου"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Χώρος αναψυχής"
@@ -21903,5 +22238,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Επεξεργασία χώρου αναψυχής"
@@ -21909,15 +22244,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Οικιστική περιοχή"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Επεξεργασία οικιστικής περιοχής"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Νεκροταφείο"
@@ -21925,9 +22260,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Επεξεργασία Νεκροταφείου"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Κοιμητήριο"
@@ -21935,39 +22270,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Επεξεργασία χρήσης γης κοιμητηρίου"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Βιομηχανική"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr ""
@@ -21975,15 +22310,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Στρατιωτικά"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr ""
@@ -21991,55 +22326,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Εγοτάξιο"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Επεξεργασία εργοταξίου"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "ΧΥΤΑ"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Λατομείο"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Επεξεργασία Λατομείου"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr ""
@@ -22049,5 +22384,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr ""
@@ -22056,10 +22391,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr ""
@@ -22067,5 +22402,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Περιορισμός στροφής"
@@ -22074,5 +22409,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Επεξεργασία περιορισμού στροφής"
@@ -22080,34 +22415,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Περιορισμός"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "όχι_αριστερή_στροφή"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "όχι_δεξιά_στροφή"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "όχι_ευθεία"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "όχι_αναστροφή"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "μόνο_δεξιά_στροφή"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "μόνο_αριστερή_στροφή"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "μόνο_ευθεία"
@@ -22116,15 +22451,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr ""
@@ -22132,5 +22467,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Διαδρομή"
@@ -22139,5 +22474,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Επεξεργασία Διαδρομής"
@@ -22145,5 +22480,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Τύπος Διαδρομής"
@@ -22215,5 +22550,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22222,17 +22557,17 @@
 msgstr "ποδήλατο"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "λεωφορείο"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "δρόμος"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "σκι"
@@ -22285,5 +22620,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22292,13 +22627,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "πεζοπορία"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "τραμ"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "παράκαμψη"
@@ -22312,10 +22647,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "υπόγειος"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Περιγραφή συμβόλου"
@@ -22323,31 +22658,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "προτεινόμενο"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "εναλλακτικό"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "προσωρινό"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "σύνδεση"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Χρώμα (δεκαεξαδικό)"
@@ -22356,30 +22691,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "τμήμα διαδρομής"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22817,11 +23152,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr ""
@@ -24845,5 +25180,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25515,4 +25850,12 @@
 #.
 #. <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"/>
@@ -25537,5 +25880,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "ιστορικό"
@@ -25549,5 +25892,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "λατομείο"
@@ -25561,5 +25904,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "Χ.Υ.Τ.Α."
@@ -25581,5 +25924,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "λεκάνη"
@@ -25593,5 +25936,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "δάσος"
@@ -25605,5 +25948,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr ""
@@ -25626,5 +25969,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr ""
@@ -25638,5 +25981,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "βιομηχανική"
@@ -25650,5 +25993,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25662,5 +26005,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25674,5 +26017,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25729,7 +26072,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "στρατιωτική"
@@ -25743,5 +26086,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "κοιμητήριο"
@@ -25754,5 +26097,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "κορυφή"
@@ -25767,5 +26110,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "παγετώνας"
@@ -25779,5 +26122,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "ηφαίστειο"
@@ -25832,8 +26175,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr ""
@@ -25847,5 +26190,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr ""
@@ -25859,5 +26202,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr ""
@@ -25871,8 +26214,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "άλσος"
+msgstr ""
 
 #. color water
@@ -25884,5 +26226,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "λάσπη"
@@ -25896,5 +26238,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "παραλία"
@@ -25972,8 +26314,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "διαδρομή"
@@ -26021,7 +26363,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "όριο"
@@ -26171,11 +26513,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr ""
@@ -26223,6 +26565,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "διεύθυνση"
@@ -26530,20 +26872,53 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgid "File could not be found."
+#~ msgstr "Το αρχείο δεν βρέθηκε."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία εργασία για λήψη"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Η αποστολή στο OSM API απέτυχε"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Αντικρουόμενη σχέση"
+
+#~ msgid "File not found"
+#~ msgstr "Το αρχείο δεν βρέθηκε"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "ΠΑρακλώ εισάγετε τις επιθυμητές συντεταγένες πρώτα."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Επιλέξτε ένα σελιδοδείκτη πρώτα."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Εισαγωγή ακολουθίας προς αναζήτηση"
+
+#~ msgid "name"
+#~ msgstr "όνομα"
+
+#~ msgid "zoom"
+#~ msgstr "ζουμ"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Παρακαλώ επιλέξτε την γραμμή προς αντιγραφή"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "Η επεξεργασία σελίδων βοήθειας έιναι δυνατή μόνο από το JOSM Online Help"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Χρήση προεπιλογής \"{0}\""
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Χειροκίνητη ρύθμιση ζώνης Lambert (π.χ. για τοποθεσίες μεταξύ δύο ζωνών)"
+#~ "(Μπορείτε να αλλάξετε τις μέρες έπειτα από τις οποίες αυτή η "
+#~ "προειδοποίηση εμφανίζεται <br>θέτωντας την επιλογή 'pluginmanager."
+#~ "warntime' στην διαμόρφωση.)"
+
+#~ msgid "Request Update"
+#~ msgstr "Αίτηση  Ενημέρωσης"
+
+#~ msgid "requested: {0}"
+#~ msgstr "ζητήθηκαν: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "Σφάλμα κατά την αίτηση ενημέρωσης"
 
 #~ msgid ""
@@ -26577,7 +26952,4 @@
 #~ "Η μεταφορά διακόπηκε λόγω σφάλματος (θα γίνει αναμονή για 5 δευτερόλεπτα):"
 
-#~ msgid "Aborting..."
-#~ msgstr "Διακοπή..."
-
 #~ msgid "Empty member in relation."
 #~ msgstr "Άδειο μέλος στη σχέση."
@@ -26609,4 +26981,7 @@
 #~ msgid "Open in Browser"
 #~ msgstr "Άνοιγμα σε Φυλλομετρητή"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Σφάλμα κατά την φόρτωση της σελίδας {0}"
 
 #~ msgid "Contacting the OSM server..."
@@ -26738,7 +27113,4 @@
 #~ msgstr "Κατεχόμενο από"
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "Ανανέωση της λίστας επιλεγμένων."
-
 #~ msgid "Ill-formed node id"
 #~ msgstr "Κακοσχηματισμένο id κόμβου"
@@ -26758,4 +27130,14 @@
 #~ msgid "Email"
 #~ msgstr "Email"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr ""
+#~ "Η επεξεργασία σελίδων βοήθειας έιναι δυνατή μόνο από το JOSM Online Help"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Χρήση προεπιλογής \"{0}\""
 
 #~ msgid "Tagging preset source"
@@ -26850,7 +27232,4 @@
 #~ msgstr "Επιβεβαίωση συγχώνευσης"
 
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:"
-
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -26904,4 +27283,8 @@
 #~ msgstr "Άκυρη προβολή"
 
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr ""
+#~ "Χειροκίνητη ρύθμιση ζώνης Lambert (π.χ. για τοποθεσίες μεταξύ δύο ζωνών)"
+
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
 #~ msgstr ""
@@ -26955,9 +27338,4 @@
 #~ msgstr "Εφαρμογή μερικών επιλύσεων"
 
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Αποτυχία φόρτωσης ιστορικού από τον διακομιστή. Λεπτομέρειες:<br>{0}"
-#~ "</html>"
-
 #~ msgid "Error when communicating with server."
 #~ msgstr "Σφάλμα κατά την επικοινωνία με τον διακομιστή."
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 18273)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 18508)
@@ -10,6 +10,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-17 15:06+0000\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-25 14:04+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: British English <en@li.org>\n"
@@ -18,67 +18,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:07+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoring malformed URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -91,12 +91,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -106,27 +100,26 @@
 msgstr "Warning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoring malformed file URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -134,23 +127,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -158,5 +152,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -165,21 +159,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -188,5 +183,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -199,17 +194,9 @@
 msgstr "Error"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "UNKNOWN"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "About"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Display the about screen."
@@ -217,37 +204,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Last change at {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Bug Reports"
@@ -257,5 +244,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -263,33 +250,29 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Readme"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revision"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Contribution"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "License"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "About JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "File could not be found."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -326,42 +309,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -369,5 +351,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -380,19 +362,19 @@
 msgstr "Please select at least one already uploaded node, way, or relation."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Please select the target layer."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Select target layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Merge"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -403,50 +385,50 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "No target layers"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Add Node..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Add a node by entering latitude and longitude."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Edit: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Enter the coordinates for the new node."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Use decimal degrees."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negative values denote Western/Southern hemisphere."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -455,5 +437,5 @@
 msgstr "Latitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -462,27 +444,27 @@
 msgstr "Longitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Align Nodes in Circle"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Move the selected nodes into a circle."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -492,5 +474,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -506,30 +488,28 @@
 msgstr "Tool: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Please select at least four nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -539,84 +519,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Align Nodes in Line"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Move the selected nodes in to a line."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Please select at least three nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "conflict"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "download"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom to {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom the view to {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "View: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Nothing selected to zoom to."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "No conflicts to zoom to"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Close open changesets"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Closes open changesets"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -624,37 +604,37 @@
 msgstr "File: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "There are no open changesets"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "No open changesets"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Downloading open changesets ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Combine Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Combine several ways into one."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Change directions?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Reverse and Combine"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -664,5 +644,5 @@
 "reverse some of them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -672,41 +652,41 @@
 "nodes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combine {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Please select at least two ways to combine."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Copy"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Copy selected objects to paste buffer."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Please select something to copy."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Create Circle"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Create a circle from three selected nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Those nodes are not in a circle. Aborting."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -716,16 +696,14 @@
 "three nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -737,5 +715,5 @@
 msgstr "Delete"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Delete selected objects."
@@ -743,6 +721,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -756,73 +734,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Distribute Nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Distribute the selected nodes to equal distances along a line."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Download from OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Download map data from the OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Download"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Please select at least one task to download"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr "Download parent ways/relations..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Download primitives referring to one of the selected primitives"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, fuzzy, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "ID > 0 expected. Got {0}."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -831,39 +786,39 @@
 msgstr "Parameter ''{0}'' must not be null"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "There were {0} conflicts during import."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Conflicts during download"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Loading parents of primitive {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Loading parents of primitive {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Loading parents of primitive {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplicate"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicate selection by copy and immediate paste."
@@ -873,41 +828,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Exit"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Exit the application."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "All Formats"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Export to GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Export the data to GPX file."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nothing to export. Get some data first."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -946,6 +901,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -964,9 +919,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -986,5 +941,5 @@
 msgstr "parameter ''{0}'' must not be null"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -992,36 +947,36 @@
 msgstr "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Export GPX file"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Display history information about OSM ways, nodes, or relations."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Info about Element"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Display object information about OSM nodes, ways, or relations."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Join Node to Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Join a node into the nearest way segments"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Join Node and Line"
@@ -1031,168 +986,186 @@
 msgstr "No Shortcut"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Merge layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Merge the current layer into another layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Merge Nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Merge nodes into the oldest one."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Please select at least two nodes to merge."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Aborting..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "Cannot merge nodes: Would have to delete a way that is still used."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Merge {0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Merge selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Merge the currently selected primitives into another layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Mirror"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Mirror selected nodes and ways."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Please select at least one node or way."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "up"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Move objects {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "down"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "left"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "right"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Move {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Moves Objects {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Cannot move objects outside of the world."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "New"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Create a new map."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Open..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Open a file."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Opening files"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Opening file ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Open Location..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Open an URL."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Separate Layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Enter URL to download:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Download Location"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Download URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Download data"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Orthogonalise Shape"
@@ -1202,18 +1175,18 @@
 msgstr "Move nodes so all angles are 90 or 270 degree"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1222,9 +1195,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1236,36 +1209,37 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Orthogonalise"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Paste"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Paste contents of paste buffer."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Paste Tags"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Apply tags of contents of paste buffer to all selected items."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1274,5 +1248,5 @@
 msgstr[1] "Pasting {0} tags"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1281,59 +1255,59 @@
 msgstr[1] "to {0} primtives"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Preferences..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Open a preferences page for global settings."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Redo"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Redo the last undone action."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Rename layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Also rename the file"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Could not rename file ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Reverse Ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Reverse the direction of all selected ways."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Please select at least one way."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Reverse ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1341,10 +1315,10 @@
 msgstr "Save"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Save the current data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1395,21 +1369,21 @@
 msgstr "Save Layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Save As..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Save the current data to a new file."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Select All"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1419,29 +1393,29 @@
 "objects too."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Show Status Report"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Show status report with useful information that can be attached to bugs"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Help: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Status Report"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Copy to clipboard and close"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1450,18 +1424,18 @@
 msgstr "Close"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Split Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Split a way at the selected node."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "The current selection cannot be used for splitting."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1469,5 +1443,5 @@
 msgstr[1] "The selected nodes are not in the middle of any way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1483,9 +1457,9 @@
 "way also."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "The selected nodes do not share the same way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1493,10 +1467,10 @@
 msgstr[1] "The selected way does not contain all the selected nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "You must select two or more nodes to split a circular way."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1527,60 +1501,60 @@
 msgstr "Split way {0} into {1} parts"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Toggle GPX Lines"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Draw lines between raw gps points."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Toggles the global setting ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "UnGlue Ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplicate nodes that are used by multiple ways."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "This node is not glued to anything else."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "None of these nodes are glued to anything else."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "None of this way's nodes are glued to anything else."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "The current selection cannot be used for unglueing."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Select either:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* One tagged node, or"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* One node that is used by more than one way, or"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* One node that is used by more than one way and one of those ways, or"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1588,5 +1562,5 @@
 "* One way that has one or more nodes that are used by more than one way, or"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1594,5 +1568,5 @@
 "* One way and one or more of its nodes that are used by more than one way."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1606,9 +1580,9 @@
 "own copy and all nodes will be selected."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Unglued Node"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1616,67 +1590,68 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Dupe {0} nodes into {1} nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Undo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Undo the last action."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Unselect All"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Unselect all objects."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Unselect All (Focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Unselect All (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Update data"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
 msgstr "Updates the objects in the current data layer from the server."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Updating data"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr "Download data"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "No current dataset found"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Update selections"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
@@ -1684,13 +1659,13 @@
 "Updates the currently selected objects from the server (re-downloads data)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Update Selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "There are no selected primitives to update."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Selection empty"
@@ -1702,8 +1677,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "Upload all changes in the current data layer to the OSM server"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1714,5 +1690,5 @@
 "resolve them first.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1720,29 +1696,29 @@
 msgstr "No changes to upload."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Nothing to upload. Get some data first."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Synchronize entire dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1763,11 +1739,11 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Conflicts detected"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1782,5 +1758,5 @@
 "<strong>{1}</strong> to abort and continue editing.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1793,24 +1769,22 @@
 "again with a new or an existing open changeset.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Changeset closed"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Cancel conflict resolution"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr "Close this dialogue and resume editing in JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1821,28 +1795,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Upload to OSM API failed"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Updating primitive"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1851,19 +1816,36 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, fuzzy, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
 "Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
 "primitive and retrying to upload."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, fuzzy, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
 msgstr ""
 "Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
 "primitive and retrying to upload."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Change {0} object"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Upload selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1882,11 +1864,11 @@
 msgstr "Checking for deleted parents in the local dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Zoom In"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Zoom Out"
@@ -1966,21 +1948,17 @@
 msgstr "Slower Forwards"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Downloading GPS data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Downloaded GPX Data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Raw GPS data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Downloading data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1989,27 +1967,42 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "No data found in this area."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Download {0} of {1} ({2} left)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "The following errors occurred during mass download:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Errors during Download"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Updating data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "visible (on the server)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+#, fuzzy
+msgid ""
+"Click to check whether objects in your local dataset are deleted on the "
+"server"
+msgstr ""
+"{0} object has been purged from the local dataset because it is deleted on "
+"the server."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignore"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Cancel the upload and resume editing"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2026,7 +2019,22 @@
 "</strong> to ignore.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Deleted or moved primitives"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "The following errors occurred during mass download:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Errors during Download"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Errors during Download"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2048,5 +2056,5 @@
 msgstr "Mode: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2076,38 +2084,38 @@
 msgstr "selected"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Add node into way and connect"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Create new node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Select node under cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2116,14 +2124,14 @@
 msgstr[1] "Insert new node into {0} ways."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "Start new way from last node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Continue way from last node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Finish drawing."
@@ -2143,5 +2151,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Release the mouse button to select the objects in the rectangle."
@@ -2152,5 +2160,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Release the mouse button to stop rotating."
@@ -2215,5 +2223,5 @@
 msgstr "Always move and don't show dialogue again"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2221,5 +2229,5 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2231,4 +2239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zoom"
@@ -2248,5 +2257,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Search..."
@@ -2348,20 +2356,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - object with given number of nodes"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - all changed objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - all selected objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - all incomplete objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - all untagged objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2369,5 +2384,5 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2375,17 +2390,17 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Use <b>|</b> or <b>OR</b> to combine with logical or"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Use <b>(</b> and <b>)</b> to group expressions"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2395,51 +2410,51 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "Submit filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Start Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "No match found for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nothing added to selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nothing removed from selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Nothing found in selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Found {0} matches"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2470,26 +2485,40 @@
 msgstr "Unknown primitive type: {0}. Allowed values are node, way or relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Unexpected token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Missing arguments for or."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Missing argument for not."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Expected closing bracket."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Wrong number of parameters for nodes operator."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
+"nodes or range, for example nodes:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Wrong number of parameters for nodes operator."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2500,5 +2529,5 @@
 "nodes or range, for example nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2602,4 +2631,20 @@
 msgstr "Cycling dependencies"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2617,8 +2662,8 @@
 msgstr "Add relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Purged {0} objects"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2701,5 +2746,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Double conflict"
@@ -2738,4 +2783,15 @@
 msgstr "cannot resolve undecided conflict"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parameter ''{0}'' must not be empty"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2766,33 +2822,6 @@
 msgstr[1] "Delete {0} relations"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Conflicting relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Delete from relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Split way segment"
@@ -2800,6 +2829,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2811,5 +2840,5 @@
 "be using them.<br>Do you really want to delete?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Delete confirmation"
@@ -2998,15 +3027,30 @@
 msgstr "Automatic tag correction"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Default value is ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Warning: failed to persist preferences to ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Malformed config file at lines {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3017,5 +3061,5 @@
 "isn't a directory."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3026,5 +3070,5 @@
 "isn't a directory.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3035,5 +3079,5 @@
 "preference directory: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3044,5 +3088,5 @@
 "preference directory: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3051,5 +3095,5 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3060,5 +3104,5 @@
 "file."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3069,5 +3113,5 @@
 "to default: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3078,5 +3122,5 @@
 "<br> and creating a new default preference file.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3087,19 +3131,42 @@
 "default: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferences stored on {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Could not upload preferences. Reason: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Could not load preferences from server."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3110,5 +3177,27 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "UNKNOWN"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3130,20 +3219,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "W"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "E"
@@ -3155,4 +3244,18 @@
 msgid "Changeset {0}"
 msgstr "Changeset {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3219,14 +3322,14 @@
 msgstr "Warning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "expected id >= 0. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "a primitive with id=0 can't be invisible"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3234,5 +3337,5 @@
 msgstr "ID > 0 expected. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3261,6 +3364,6 @@
 "multiple values"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3320,113 +3423,113 @@
 msgstr "parameter {0} not in range 0..{1}, got {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Area style way is not closed."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "multipolygon way ''{0}'' is not closed."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Deleted member ''{0}'' in relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Way ''{0}'' with less than two points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "More than one \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "More than one \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "More than one \"via\" found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unknown role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unknown member type for ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "No \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "No \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "No \"via\" node or way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "The \"from\" way doesn't start or end at a \"via\" node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "The \"to\" way doesn't start or end at a \"via\" node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "The \"from\" way doesn't start or end at the \"via\" way."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "The \"to\" way doesn't start or end at the \"via\" way."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Style for restriction {0} not found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Intersection between ways ''{0}'' and ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Inner way ''{0}'' is outside."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "No useful role ''{0}'' for Way ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-Way ''{0}'' in multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "No outer way for multipolygon ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Intersection between ways ''{0}'' and ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Inner way ''{0}'' is outside."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Style for inner way ''{0}'' equals multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3442,11 +3545,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "text"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3465,5 +3567,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3474,5 +3575,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3501,5 +3601,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "background"
@@ -3533,12 +3633,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambert Zone (France)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambert Zone (France)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3574,5 +3672,5 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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>"
@@ -3580,5 +3678,5 @@
 "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3607,5 +3705,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "railway"
@@ -3622,4 +3720,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3635,33 +3735,33 @@
 msgstr[1] "{0} members"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Precondition violation"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Security exception"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Network exception"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "IO Exception"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Internal Server Error"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Bad Request"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr "Not Found"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3669,16 +3769,16 @@
 msgstr "Conflict"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Unknown host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr "Object deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3691,4 +3791,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Downloading \"Message of the day\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Close the dialogue"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3758,74 +3863,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Username"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Open file (as raw gps, if .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Set the language."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3837,9 +3942,9 @@
 "      Java option to increase the maximum size of allocated memory"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3849,25 +3954,25 @@
 "some data before --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Activating updated plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Loading early plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Loading plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3880,11 +3985,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3909,6 +4014,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4011,25 +4116,22 @@
 msgstr "(no object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "User:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "layer not in list."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Layer ''{0}'' must be in list of layers"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Error while parsing"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "File not found"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "No, cancel operation"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4051,5 +4153,5 @@
 msgstr "unset: do not set this property on the selected objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4057,49 +4159,42 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125
-#, fuzzy
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
 "relation</strong>.</html>"
 msgstr ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
 "relations</strong>.</html>"
 msgstr ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
 "relations</strong>.</html>"
 msgstr ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Delete {0} object"
-msgstr[1] "Delete {0} objects"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Delete {0} object"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "not deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4111,5 +4206,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4158,5 +4253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4173,5 +4268,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4385,8 +4480,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4712,6 +4807,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4725,6 +4820,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4782,36 +4877,36 @@
 msgstr "Their dataset does not include a tag with key {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr "Conflicts when combining primitives"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr "Conflicts when combining ways - combined way is ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, fuzzy, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
 msgstr "Conflicts when merging nodes - merged node is ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr "No conflicts to resolve"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
 msgstr "Cancel conflict resolution"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
 msgstr "Apply resolved conflicts"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Apply"
@@ -4823,5 +4918,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "all"
@@ -4911,4 +5006,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4919,4 +5016,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4930,49 +5028,86 @@
 msgstr "pos {0} is out of range. current number of members: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr "Remove this relation member from the relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Replace"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr "Replace the way this member refers to with the combined way"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "Keep mine"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Remove this relation member from the relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr "Undecided"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr "Not decided yet"
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Role:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Sets a role for the selected members"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#, fuzzy
+msgid "Tag modified relations with "
 msgstr "Tag modified relations with   "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
 msgctxt "tag"
 msgid "Key:"
 msgstr "Key:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Value:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "Apply this role to all members"
@@ -5009,6 +5144,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5101,10 +5236,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5171,5 +5303,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5214,4 +5347,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Activate"
@@ -5237,6 +5371,6 @@
 msgstr "Information about layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5245,22 +5379,22 @@
 msgstr[1] "This will change up to {0} objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "An empty value deletes the key."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Change values?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5269,69 +5403,73 @@
 msgstr[1] "Change properties of up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Please select a key"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Please select a value"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Please select the objects you want to change properties for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Properties/Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Properties for selected objects."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Member Of"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Edit Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Delete from relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Delete Properties"
@@ -5339,40 +5477,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Open a list of all relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Open an editor for the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Delete the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Create a new relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Create a copy of this relation and open it in another editor window"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr "Set the current selection to the list of selected relations"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Delete the selected relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Select either:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Download selected relations"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Download Members"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5399,5 +5557,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5409,9 +5567,9 @@
 msgstr "Selection: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Undock the panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5419,5 +5577,5 @@
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Click to minimise/maximise the panel content"
@@ -5501,5 +5659,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Download relation members"
@@ -5531,23 +5690,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Tags and Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr "Parent Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr "Child Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5559,14 +5718,14 @@
 "<br>How do you want to proceed with circular dependencies?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr "Remove them, clean up relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr "Ignore them, leave relation as is"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5579,9 +5738,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr "Multiple members referring to same primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5594,5 +5753,5 @@
 "''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5600,5 +5759,5 @@
 "Add all primitives selected in the current dataset before the first member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5606,5 +5765,5 @@
 "Add all primitives selected in the current dataset after the last member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5614,5 +5773,5 @@
 "member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5622,15 +5781,15 @@
 "member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Remove all members referring to one of the selected primitives"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr "Relation Editor: Remove Selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
@@ -5638,5 +5797,5 @@
 "Select relation members which refer to primitives in the current selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5647,67 +5806,66 @@
 "selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr "Select primitives for selected relation members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Sort the relation members"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "Relation Editor: Sort"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Move the currently selected members up"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "Relation Editor: Move Up"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Move the currently selected members down"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "Relation Editor: Move Down"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr "Remove the currently selected members from this relation"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "Relation Editor: Remove"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr "Delete the currently edited relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "Yes, create a conflict and close"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Yes, create a conflict and close"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "No, continue editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5719,9 +5877,9 @@
 "conflict and close the editor?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "Conflict in data"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5732,41 +5890,41 @@
 "<br>Please resolve this conflict first, then try again.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "Apply the current updates"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Apply the updates and close the dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Cancel the updates and close the dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Add an empty tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Download all incomplete ways and nodes in relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Download Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr "Relation Editor: Download Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Sets a role for the selected members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Apply Role"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5779,17 +5937,17 @@
 "new role?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "Yes, apply it"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "No, don't apply"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr "Confirm empty role"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Edit the relation the currently selected relation member refers to"
@@ -5800,13 +5958,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr "Zoom to primitive the first selected member refers to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Zooming disabled because layer of this relation is not active"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr "Zooming disabled because there is no selected member"
@@ -5820,14 +5978,14 @@
 msgstr "Linked"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr "Download referring relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr "Value of child.getId() > 0 expected. Got {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5878,60 +6036,88 @@
 "Warning: ignoring exception because task was cancelled. Exception was: "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Not connected"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Sort the relation members"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Sort the relation members"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Please enter the desired coordinates first."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Create boundary"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Edit the currently selected relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Please enter a name for the location."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr "Name of location"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Select a bookmark first."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Move the currently selected members up"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Move the currently selected members up"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5941,366 +6127,137 @@
 "area)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Bounding Box"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Data Sources and Types"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Split a way at the selected node."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Raw GPS data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "The selected way does not contain the selected node."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Download as new layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Download Area"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Download"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "No relation is selected"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Download area too large, will probably be rejected by server"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Download area ok, size probably acceptable to server"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Edit the currently selected relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Please select the row to edit."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Enter a place name to search for:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Enter a place name to search for:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 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:168
-msgid "Please enter a search string"
-msgstr "Please enter a search string"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Cannot read place search results from server"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Enter a place name to search for:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Places"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "name"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "type"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "near"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Slippy map"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "zoom level"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x from"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "to"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y from"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Tile Numbers"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr "JOSM Help Browser"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
-"check your internet connection.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr "Open the current help page in an external browser"
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr "Edit the current help page"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr "Reload the current help page"
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
 #, fuzzy
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr "Warning: failed to put dialog always on top. Exception was: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Search ..."
+msgstr "Search..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
 #, fuzzy
-msgid "Failed to open help page"
-msgstr "Reload the current help page"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr "Latitude: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr "Longitude: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr "Coordinates"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "History for node {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "History for way {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "History for relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Close the dialogue"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr "Reload the history from the server"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr "history not initialised yet. Failed to set reference primitive."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-"failed to set reference. reference version {0} not available in history"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr "history not initialised yet. Failed to set current primitive."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr "failed to set current. current version {0} not available in history"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Load history"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr "Loading history for node {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr "Loading history for way {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr "Loading history for relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Node {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Way {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relation {0}"
+msgid "Click to start searching for places"
+msgstr "Direction to search for land"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6657,4 +6614,6 @@
 #. 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" />
@@ -7035,6 +6994,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7100,11 +7060,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7114,6 +7074,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7123,79 +7083,351 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Name"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Type"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "near"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Slippy map"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "zoom level"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x from"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "to"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y from"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Tile Numbers"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr "JOSM Help Browser"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr "Open the current help page in an external browser"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr "Edit the current help page"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr "Reload the current help page"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr "Latitude: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr "Longitude: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr "Coordinates"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "History for node {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "History for way {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "History for relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Close the dialogue"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr "Reload the history from the server"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr "history not initialised yet. Failed to set reference primitive."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+"failed to set reference. reference version {0} not available in history"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr "history not initialised yet. Failed to set current primitive."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr "failed to set current. current version {0} not available in history"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Load history"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr "Loading history for node {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr "Loading history for way {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr "Loading history for relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Node {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Way {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "User"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr "Changeset"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7277,4 +7509,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr "Launch a file chooser to select a file"
@@ -7586,6 +7819,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0} object to modifiy:"
@@ -7686,5 +7919,16 @@
 msgstr "Changeset ID > 0 expected. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr "Preparing primitives to upload ..."
@@ -7718,59 +7962,59 @@
 msgstr "Continue uploading"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Images for {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Read GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "No time for point {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Cannot read time \"{0}\" from point {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Reading {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "No images with readable timestamps found."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Reading {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS start: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS end: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "current delta: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "timezone difference: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7778,51 +8022,51 @@
 msgstr[1] "images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} within the track."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Sync clock"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG images (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "The date in file \"{0}\" could not be parsed."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "There is no EXIF time within the file \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Image"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "GPS unit timezone (difference to photo)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synchronise Time with GPS Unit"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Time entered could not be parsed."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7830,30 +8074,30 @@
 msgstr "gps point"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Customise line drawing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Use global settings."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Draw lines between points for this layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Do not draw lines between points for this layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Select line drawing options"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7861,5 +8105,5 @@
 msgstr "Customise Colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7868,5 +8112,5 @@
 msgstr "Default"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7875,43 +8119,43 @@
 msgstr "Choose a colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Markers From Named Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Named Trackpoints from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Import Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Import images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Description: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7921,28 +8165,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr "Timespan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "Length"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Length: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7951,5 +8195,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7958,10 +8202,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7971,11 +8215,11 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7985,29 +8229,29 @@
 msgstr "Converted from: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Download from OSM along this track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Download everything within:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Maximum area per request:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -8018,13 +8262,9 @@
 "wish<br>to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr "Download data"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "No GPX track available in layer to associate audio with."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8034,5 +8274,5 @@
 "the end were omitted or moved to the start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8042,23 +8282,23 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Data Layer {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "outside downloaded area"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8067,12 +8307,13 @@
 msgstr[1] "There were {0} conflicts detected."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, fuzzy, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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} object has been purged from the local dataset because it is deleted on "
@@ -8083,28 +8324,45 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
+#, fuzzy, 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] ""
 "Please consult the Conflict List Dialogue<br>and manually resolve them."
-
+msgstr[1] ""
+"Please consult the Conflict List Dialogue<br>and manually resolve them."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Close this dialogue and resume editing in JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} deleted.)"
+msgstr[1] " ({0} deleted.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consists of:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} deleted.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "unset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "API version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8276,6 +8534,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8290,6 +8546,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8473,5 +8727,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8808,21 +9062,20 @@
 msgstr "Language"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Enable built-in defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 msgid "Enable built-in icon defaults"
 msgstr "Enable built-in icon defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+msgid "Used style"
+msgstr "Used style"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
 msgid "Map Paint Styles"
 msgstr "Map Paint Styles"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
-msgid "Used style"
-msgstr "Used style"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -8836,6 +9089,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Update"
@@ -8988,68 +9240,105 @@
 msgstr "Shortcut"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Activate"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr "Icon paths"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Short Description: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "Author: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Webpage: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr "Icon paths"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Copy defaults"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Please select the row to copy."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr "The XML source (URL or filename) for {0} definition files."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr "Add a new XML source to the list."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Delete the selected source from the list."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr "Defaults (See tooltip for detailed information)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Remove the selected entries from the list of merged elements"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Edit the value of the selected key for all objects"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "Remove the selected entries from the list of merged elements"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Add a new tag"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Close the selected open changesets"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Edit the selected source."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Loading history for node {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr "<html>Failed to load history from the server. Details:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, fuzzy, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Sort presets menu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9254,5 +9543,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "More information about this feature"
@@ -9317,16 +9606,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Preset group ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Preset group ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9334,5 +9623,5 @@
 msgstr "Contacting OSM Server..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9443,5 +9732,5 @@
 msgstr "Parsing file \"{0}\" failed"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Parse error: invalid document structure for gpx document"
@@ -9672,5 +9961,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9697,5 +9986,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9703,5 +9992,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9714,5 +10003,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9723,33 +10012,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Incorrect password or username."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Warning: The password is transferred unencrypted."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Save user and password (unencrypted)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "The base URL for the OSM server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Login name (e-mail) to the OSM account."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9757,17 +10046,17 @@
 "Login password to the OSM account. Leave blank to not store any password."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Base Server URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "OSM username (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9874,5 +10163,5 @@
 msgstr "File \"{0}\" does not exist"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9881,38 +10170,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9920,19 +10209,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member> specification with ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Illegal object with id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9941,7 +10230,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9951,25 +10244,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9977,5 +10270,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9984,5 +10277,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9990,5 +10283,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9997,13 +10290,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Prepare OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -10014,14 +10307,13 @@
 msgstr "id parameter ''{0}'' > 0 required. Got {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Download from OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr "Downloading referring ways ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr "Downloading referring relations ..."
@@ -10133,15 +10425,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Update Plugins"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Download Plugins"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10154,29 +10446,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "{0} Plugin successfully downloaded. Please restart JOSM."
 msgstr[1] "{0} Plugins successfully downloaded. Please restart JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Downloading Plugin {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Skip download"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Download Plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Skip Download"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10188,5 +10484,5 @@
 msgstr "An error occurred in plugin {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -10194,5 +10490,5 @@
 "Loading of {0} plugin was requested. This plugin is no longer required."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10202,49 +10498,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Last plugin update more than {0} days ago."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Update Plugins"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Plugin {0} requires JOSM update to version {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Plugin {0} is required by plugin {1} but was not found."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Plugin not found: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Last plugin update more than {0} days ago."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Could not load plugin {0}. Delete from preferences?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Disable plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Keep plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10254,9 +10559,9 @@
 "overwrite the existing ones."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10265,10 +10570,10 @@
 "An unexpected exception occurred that may have come from the ''{0}'' plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "According to the information within the plugin, the author is {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10276,9 +10581,9 @@
 "Try updating to the newest version of this plugin before reporting a bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Should the plugin be disabled?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10288,22 +10593,22 @@
 "unload the plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr "The plugin could not be removed. Probably it was already disabled"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Plugin information"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "no description available"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "More details"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10312,18 +10617,18 @@
 msgstr[1] "Downloaded plugin information from {0} sites"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "No plugin information found."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Plug-in named {0} is not available. Update skipped."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "All installed plugins are up to date."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10336,9 +10641,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Download missing plugins"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10353,9 +10658,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10377,19 +10682,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "unknown"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin bundled with JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10453,5 +10758,5 @@
 msgstr "(The text has already been copied to your clipboard.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10460,5 +10765,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10467,5 +10772,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10475,5 +10780,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10486,10 +10791,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10498,5 +10803,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10505,16 +10810,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10527,5 +10832,5 @@
 "applet and because you didn''t load your applet from ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10536,5 +10841,5 @@
 "check your internet connection.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10543,5 +10848,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10550,10 +10855,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10562,10 +10867,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10576,5 +10881,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10587,5 +10892,5 @@
 "preferences and your internet connection.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10596,5 +10901,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10702,11 +11007,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10851,5 +11149,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -10865,10 +11164,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Odd"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10876,103 +11175,103 @@
 msgstr "Even"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -11026,46 +11325,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extracting GPS locations from EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Starting directory scan"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "One of the selected files was null !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Read photos..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Unable to get canonical path for directory {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanning directory {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Found null file in directory {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Error while getting files from directory {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Correlate to GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11330,5 +11630,5 @@
 msgstr "Error on file {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11341,10 +11641,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11392,13 +11692,13 @@
 msgstr "Choose from..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11410,13 +11710,13 @@
 "Would you like to restore F11 for grab action ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr "Restore grab shortcut F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM is stopped for the change to take effect."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11535,7 +11835,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Display coordinates as"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11553,5 +11852,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11594,13 +11893,13 @@
 msgstr "Create boundary"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11731,22 +12030,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Change location"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Set a new location for the next request"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Add a new layer"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Location"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11756,5 +12055,5 @@
 "known by www.cadastre.gouv.fr .</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Add new layer"
@@ -11768,9 +12067,9 @@
 msgstr "Get a new cookie (session timeout)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11793,5 +12092,5 @@
 msgstr "Adjust the position of the WMS layer (raster images only)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11815,5 +12114,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Blank Layer"
@@ -11842,5 +12141,5 @@
 msgstr "Commune bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11851,18 +12150,18 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Cache Format Error"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Cache Lambert Zone Error"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11960,5 +12259,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "No data loaded."
@@ -12367,7 +12666,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "water"
@@ -12575,32 +12874,32 @@
 msgstr "LiveGPS layer"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Capture GPS Track"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Connect to gpsd server and show current position in LiveGPS layer."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Centre Once"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centre the LiveGPS layer to current position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Auto-Centre"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Continuously centre the LiveGPS layer to current position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12689,24 +12988,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12861,4 +13160,9 @@
 msgstr "Firefox executable"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Layer"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12907,30 +13211,30 @@
 msgstr "Permitted actions"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control has been asked to load data from the API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Do you want to allow this?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Confirm Remote Control action"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control has been asked to import data from the following URL:"
@@ -12949,7 +13253,5 @@
 msgstr "No relation is selected"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12958,4 +13260,5 @@
 #: ../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 "Routing"
@@ -12977,25 +13280,25 @@
 msgstr "Open a list of routing nodes"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
 msgstr "Add routing layer"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Criteria"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "Shortest"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "Fastest"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Reverse route"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Clear route"
@@ -13025,93 +13328,87 @@
 msgstr "Enter weight values"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Auto zoom: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Load Tile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "Show Tile Status"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Request Update"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Show info"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Load All Tiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Increase zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Decrease zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "image "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "autoload tiles"
 
 #. 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Settings for the SlippyMap plugin."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Tile Sources"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Auto zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Autoload Tiles: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Max zoom lvl: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Max zoom lvl: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Fade background: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "error loading metadata"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr "error requesting update: not zoom-level 12"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "requested: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "error requesting update"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -13124,5 +13421,5 @@
 msgstr "Save captured data to file every minute."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13285,5 +13582,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Street name"
@@ -13330,29 +13627,29 @@
 msgstr "Please select at least one closed way the should be joined."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "No intersection found. Nothing was changed."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Added node on all intersections"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Delete Ways that are not part of an inner multipolygon"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Fix relations"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Joined self-overlapping area"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Joined overlapping areas"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13362,33 +13659,33 @@
 "verify no errors have been introduced."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Enter values for all conflicts."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Solve Conflicts"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Fix tag conflicts"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Removed Element from Relations"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Join Areas: Remove Short Ways"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Closed Way"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Remove tags from inner ways"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Join Areas Function"
@@ -13599,8 +13896,4 @@
 msgstr "Fix the selected errors."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignore"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13645,25 +13938,24 @@
 msgstr "Replace \"{0}\" by \"{1}\" for"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Coastlines."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "This test checks that coastlines are correct."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Unordered coastline"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Unordered coastline"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Unordered coastline"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13685,18 +13977,18 @@
 msgstr "Crossing ways"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Duplicated nodes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "This test checks that there are no nodes at the very same location."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Confirmation"
@@ -13945,4 +14237,8 @@
 msgstr "Edit the selected source."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Delete the selected source from the list."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14157,7 +14453,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "building"
@@ -14171,5 +14467,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "area"
@@ -14179,25 +14475,25 @@
 msgstr "Unclosed way"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Unconnected ways."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "This test checks if a way has an endpoint very near to another way."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Way end node near other highway"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Way end node near other way"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Way node near other way"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Connected way end node near other way"
@@ -14291,22 +14587,26 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
-#, fuzzy
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS layer ({0}), downloading in zoom {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr "Walking Papers: {0}"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "Select a starting node on the end of a way"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "Reached the end of the line"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "Reached a junction"
@@ -14570,9 +14870,9 @@
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Open a blank WMS layer to load data from a file"
@@ -15062,6 +15362,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Reference"
@@ -15623,5 +15923,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15633,5 +15933,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "wood"
@@ -15919,7 +16219,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "yes"
@@ -16068,8 +16368,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "no"
@@ -16196,31 +16496,4 @@
 msgstr "Edit Junction"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Type"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16341,5 +16614,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "residential"
@@ -16374,5 +16647,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "service"
@@ -16407,5 +16680,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "construction"
@@ -16795,12 +17068,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operator"
@@ -17013,6 +17286,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Elevation"
@@ -17439,5 +17712,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "marsh"
@@ -17970,25 +18243,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Opening Hours"
@@ -18054,24 +18327,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -18084,24 +18357,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -18114,24 +18387,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -18164,6 +18437,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Reference number"
@@ -18179,5 +18452,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "underground"
@@ -18191,5 +18464,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Fee"
@@ -18425,5 +18698,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Shelter"
@@ -18891,5 +19164,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cycling"
@@ -18904,5 +19177,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skiing"
@@ -19056,16 +19329,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Archaeological Site"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Edit Archaeological Site"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Memorial"
@@ -19073,55 +19359,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Playground"
@@ -19129,35 +19415,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -19171,6 +19457,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "select sport:"
@@ -19562,30 +19848,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "sport"
@@ -19595,227 +19881,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Edit Multi"
+
+#. 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 "type"
 
 #. item "Sport/Multi" combo "type"
@@ -19852,203 +20191,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "pitch"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "sports_centre"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadium"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -20056,56 +20395,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "intermediate"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Shooting"
@@ -20113,182 +20452,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Edit American Football"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Edit Rugby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Buildings"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Building"
@@ -20296,5 +20635,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Public Building"
@@ -20302,10 +20641,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Town hall"
@@ -20313,10 +20652,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Embassy"
@@ -20324,10 +20663,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -20336,10 +20675,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Prison"
@@ -20348,10 +20687,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Police"
@@ -20361,10 +20700,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -20373,10 +20712,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Post Office"
@@ -20384,5 +20723,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -20390,15 +20729,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "School"
@@ -20406,10 +20745,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "University"
@@ -20417,10 +20756,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "College"
@@ -20428,5 +20767,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Edit College"
@@ -20434,5 +20773,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cinema"
@@ -20441,10 +20780,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Library"
@@ -20453,9 +20792,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -20463,10 +20802,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Theatre"
@@ -20475,10 +20814,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -20488,5 +20827,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -20495,6 +20834,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religion"
@@ -20503,66 +20842,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Denomination"
@@ -20571,81 +20910,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Addresses"
@@ -20654,5 +20993,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -20660,5 +20999,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "House number"
@@ -20666,20 +21005,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "House name"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "City name"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Country code"
@@ -20688,5 +21027,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -20694,61 +21033,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20756,25 +21095,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -20782,10 +21121,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Windmill"
@@ -20793,10 +21132,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -20805,37 +21144,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -20845,10 +21184,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Crane"
@@ -20856,10 +21195,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Edit Crane"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Beacon"
@@ -20867,10 +21206,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -20878,10 +21217,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -20889,5 +21228,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
@@ -20895,5 +21234,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -20903,35 +21242,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Power Station"
@@ -20940,10 +21279,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -20952,5 +21291,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -20958,10 +21297,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -20972,23 +21311,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Power Line"
@@ -20997,75 +21336,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Voltage"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Toilets"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telephone"
@@ -21074,5 +21413,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -21080,5 +21419,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Coins"
@@ -21086,5 +21425,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Notes"
@@ -21092,5 +21431,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -21098,5 +21437,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -21104,15 +21443,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Recycling"
@@ -21121,5 +21460,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -21127,35 +21466,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Bench"
@@ -21164,31 +21503,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -21259,40 +21598,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "green"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "grass"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -21301,30 +21639,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Fountain"
@@ -21333,10 +21671,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -21345,10 +21683,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -21356,33 +21694,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -21390,9 +21728,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -21400,27 +21738,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -21428,5 +21766,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -21434,88 +21772,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Butcher"
@@ -21523,9 +21861,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Edit Butcher"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Baker"
@@ -21533,9 +21871,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Edit Baker"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Florist"
@@ -21543,18 +21881,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Edit Florist"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Organic"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Alcohol"
@@ -21562,54 +21900,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Edit Alcohol Shop"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -21617,9 +21955,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Edit Garden Centre"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Hardware"
@@ -21627,9 +21965,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Edit Hardware Store"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -21637,54 +21975,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Edit Do-it-yourself-store"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Toys"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Edit Video Shop"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -21692,9 +22030,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Edit Dry Cleaning"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Laundry"
@@ -21702,9 +22040,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Edit Laundry"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -21712,28 +22050,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Edit Outdoor Shop"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Optician"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Bank"
@@ -21741,14 +22079,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Edit Bank"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -21756,5 +22094,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -21762,15 +22100,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Doctors"
@@ -21778,18 +22116,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -21797,5 +22135,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -21803,9 +22141,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Dispensing"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Hospital"
@@ -21813,10 +22151,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -21825,5 +22163,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -21832,20 +22170,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Phone Number"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -21853,5 +22191,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -21860,59 +22198,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Places"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Country"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "State"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "County"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Edit County"
@@ -21920,15 +22263,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "City"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Town"
@@ -21936,10 +22279,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Suburb"
@@ -21947,25 +22290,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -21973,5 +22316,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Locality"
@@ -21979,10 +22322,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Island"
@@ -21990,10 +22333,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Edit Island"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -22001,5 +22344,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -22007,5 +22350,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -22013,10 +22356,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Peak"
@@ -22024,10 +22367,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Glacier"
@@ -22035,10 +22378,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Volcano"
@@ -22046,70 +22389,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Political"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "National park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Tree"
@@ -22118,15 +22461,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Wood"
@@ -22135,5 +22478,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -22141,17 +22484,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Forest"
@@ -22160,14 +22503,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -22175,25 +22518,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Scree"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Fell"
@@ -22201,10 +22544,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Heath"
@@ -22212,5 +22555,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Edit Heath"
@@ -22218,5 +22561,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -22225,45 +22568,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -22271,25 +22614,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Village Green"
@@ -22297,10 +22640,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Common"
@@ -22308,20 +22651,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -22329,5 +22672,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -22335,15 +22678,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -22351,9 +22694,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -22361,39 +22704,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Railway land"
@@ -22401,15 +22744,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -22417,55 +22760,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -22475,5 +22818,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -22482,10 +22825,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "outer segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "inner segment"
@@ -22493,5 +22836,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -22500,5 +22843,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -22506,34 +22849,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -22542,15 +22885,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "to way"
@@ -22558,5 +22901,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Route"
@@ -22565,5 +22908,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -22571,5 +22914,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Route type"
@@ -22641,5 +22984,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22648,17 +22991,17 @@
 msgstr "bicycle"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "ski"
@@ -22711,5 +23054,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22718,13 +23061,13 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "hiking"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "detour"
@@ -22738,10 +23081,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -22749,31 +23092,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -22782,30 +23125,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -23243,11 +23586,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "deprecated"
@@ -25271,5 +25614,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "light_water"
@@ -25941,4 +26284,12 @@
 #.
 #. <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"/>
@@ -25963,5 +26314,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "historic"
@@ -25975,5 +26326,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "quarry"
@@ -25987,5 +26338,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "landfill"
@@ -26007,5 +26358,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "basin"
@@ -26019,5 +26370,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "forest"
@@ -26031,5 +26382,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "farmyard"
@@ -26052,5 +26403,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "retail"
@@ -26064,5 +26415,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "industrial"
@@ -26076,5 +26427,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "brownfield"
@@ -26088,5 +26439,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "greenfield"
@@ -26100,5 +26451,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "railland"
@@ -26155,7 +26506,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "military"
@@ -26169,5 +26520,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "cemetery"
@@ -26180,5 +26531,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "peak"
@@ -26193,5 +26544,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "glacier"
@@ -26205,5 +26556,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "volcano"
@@ -26258,8 +26609,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "natural"
@@ -26273,5 +26624,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "scrub"
@@ -26285,5 +26636,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "heath"
@@ -26297,8 +26648,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "area"
+msgstr ""
 
 #. color water
@@ -26310,5 +26660,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "mud"
@@ -26322,5 +26672,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "beach"
@@ -26398,8 +26748,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "route"
@@ -26447,7 +26797,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "boundary"
@@ -26597,11 +26947,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "place"
@@ -26649,6 +26999,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "address"
@@ -26956,35 +27306,99 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Error while loading page {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgid "File could not be found."
+#~ msgstr "File could not be found."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Please select at least one task to download"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Upload to OSM API failed"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Conflicting relation"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Can only edit help pages from JOSM Online Help"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Use preset ''{0}'' of group ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Use preset ''{0}''"
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "Preset group ''{0}'' of group ''{1}''"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
 #~ msgstr ""
-#~ "Set manually the Lambert zone (e.g. for locations between two zones)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Open a layer first (GPX, OSM, cache)"
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Error while parsing"
+
+#~ msgid "File not found"
+#~ msgstr "File not found"
+
+#~ msgid "Replace"
+#~ msgstr "Replace"
+
+#~ msgid "Replace the way this member refers to with the combined way"
+#~ msgstr "Replace the way this member refers to with the combined way"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Please enter the desired coordinates first."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Select a bookmark first."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Please enter a search string"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Cannot read place search results from server"
+
+#~ msgid "name"
+#~ msgstr "name"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Copy defaults"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Please select the row to copy."
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr "The XML source (URL or filename) for {0} definition files."
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Add a new XML source to the list."
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "Defaults (See tooltip for detailed information)"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Show Tile Status"
+
+#~ msgid "Request Update"
+#~ msgstr "Request Update"
+
+#~ msgid "error loading metadata"
+#~ msgstr "error loading metadata"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "error requesting update: not zoom-level 12"
+
+#~ msgid "requested: {0}"
+#~ msgstr "requested: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "error requesting update"
 
 #~ msgid "Move"
@@ -27038,7 +27452,4 @@
 #~ msgid "Unknown version"
 #~ msgstr "Unknown version"
-
-#~ msgid "Aborting..."
-#~ msgstr "Aborting..."
 
 #~ msgid "position"
@@ -27070,4 +27481,7 @@
 #~ msgstr[0] "{0} object has conflicts:"
 #~ msgstr[1] "{0} objects have conflicts:"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Can only edit help pages from JOSM Online Help"
 
 #~ msgid "Click Reload to refresh list"
@@ -27131,4 +27545,10 @@
 #~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Use preset ''{0}'' of group ''{1}''"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Use preset ''{0}''"
+
 #~ msgid "Tags (empty value deletes tag)"
 #~ msgstr "Tags (empty value deletes tag)"
@@ -27183,4 +27603,7 @@
 #~ msgid "EPSG:4326"
 #~ msgstr "EPSG:4326"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Error while loading page {0}"
 
 #~ msgid "Open in Browser"
@@ -27467,4 +27890,11 @@
 #~ msgstr "Selected makes your trace public in openstreetmap.org"
 
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Open a layer first (GPX, OSM, cache)"
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr ""
+#~ "Set manually the Lambert zone (e.g. for locations between two zones)"
+
 #~ msgid "Select Tableau d'Assemblage"
 #~ msgstr "Select Tableau d'Assemblage"
@@ -27682,7 +28112,4 @@
 #~ msgstr "Missing primitive"
 
-#~ msgid "Keep mine"
-#~ msgstr "Keep mine"
-
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Checking whether primitive {0} is gone ..."
@@ -27761,8 +28188,4 @@
 #~ msgstr "History item"
 
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Failed to load history from the server. Details:<br>{0}</html>"
-
 #~ msgid "No data"
 #~ msgstr "No data"
@@ -27866,4 +28289,14 @@
 #~ "There are unsaved changes in {0} layers. Discard the changes and continue?"
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -27896,2 +28329,5 @@
 #~ "illegal value for mandatory attribute ''{0}'' of type int (>=0), got "
 #~ "''{1}''"
+
+#~ msgid "Preset group ''{0}'' of group ''{1}''"
+#~ msgstr "Preset group ''{0}'' of group ''{1}''"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 18273)
+++ applications/editors/josm/i18n/po/es.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-20 08:10+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-06 22:15+0000\n"
+"Last-Translator: Pablo Zubiaurre <pablozub89@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:05+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Creando la interfaz principal de usuario"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL mal formado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,14 +98,14 @@
 msgstr "Advertencia"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de archivo malformado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
@@ -119,13 +113,12 @@
 "<html>No se puede leer el archivo ''{0}''.<br> El error es: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -133,23 +126,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -157,5 +151,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -164,21 +158,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -187,5 +182,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -198,17 +193,9 @@
 msgstr "Error"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "DESCONOCIDO"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Acerca de"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Mostrar la pantalla Acerca de..."
@@ -216,37 +203,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Editor Java de OpenStreetMap"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Último cambio en {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Versión de Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Página principal"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Informe de errores"
@@ -256,5 +243,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -262,33 +249,29 @@
 msgstr "Información"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Léame"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revisión"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Contribución"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licencia"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Acerca de JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "El archivo no se encuentra."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -327,42 +310,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -370,5 +352,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -381,19 +363,19 @@
 msgstr "Por favor, seleccione al menos un nodo, vía o relación ya subida."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Por favor, selecciona la capa objetivo."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Seleccionar la capa objetivo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Unir"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -403,50 +385,50 @@
 "<html>No hay capas de capa fuente <br>\"{0}\"<br>podría ser unida a.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Ninguna capas de objetivo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Añadir nodo..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Añadir nodo entrando latitud y longitud."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Editar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Introduzca las coordenadas para el nuevo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Usar grados decimales."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valores negativos denotan hemisferio Oeste/Sur"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -455,5 +437,5 @@
 msgstr "Latitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -462,27 +444,27 @@
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Alinear nodos en círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Mover los nodos seleccionados a un círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -492,5 +474,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -506,30 +488,28 @@
 msgstr "Herramienta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Por favor, selecciona al menos cuatro nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -539,84 +519,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Alinear nodos en línea"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Mover los nodos seleccionados a una línea."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Por favor seleccione como mínimo tres nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "conflicto"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "Descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom de la vista a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Vista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Nada seleccionado a lo que hacer zoom"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "No existen conflictos a los que hacer zoom"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Cerrar conjuto de cambios abiertos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Cierre de los conjuntos de cambios abiertos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -624,37 +604,37 @@
 msgstr "Archivo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "No hay conjuntos de cambios abiertos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Ningún conjunto de cambios abiertos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Descargando conjunto de cambios abiertos..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Combinar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Combinar varias vías en una."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "¿Cambiar direcciones?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Invertir y combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -664,5 +644,5 @@
 "alguna de ellas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -672,41 +652,41 @@
 "única de nodos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona al menos dos vías para combinar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Copia los objetos seleccionados al portapapeles"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Por favor, seleccione algo que copiar."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Crear círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Crear un círculo a partir de tres nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Los nodos no se encuentrar en un círculo. Abortando."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -716,16 +696,14 @@
 "tres nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -737,5 +715,5 @@
 msgstr "Borrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Eliminar objetos seleccionados."
@@ -743,6 +721,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -756,11 +734,11 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Distribuir nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr ""
@@ -768,64 +746,41 @@
 "línea."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Descargar desde OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Descargar datos del mapa del servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Descargar"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "Aceptar"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Por favor, seleccione al menos una tarea para descargar"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr "Descargando vias/relaciones padres..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 "Descargando primitivas referenciando a una de la primitivas seleccionadas"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, fuzzy, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "Se esperaba un ID >0. Obtenido {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -834,39 +789,39 @@
 msgstr "El parámetro''{0}'' no debe ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Existió {0} conflictos durante la importación."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Conflictos durante la descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) descargando padres de la primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) descargando padres de la primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) descargando padres de la primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicar la selección mediante copiar y pegar de inmediato."
@@ -876,41 +831,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Salir"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Salir de la aplicación"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Todos los formatos"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Exportar a GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exportar los datos a archivo GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nada que exportar. Obtén algunos datos primero"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -949,6 +904,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -967,9 +922,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -989,5 +944,5 @@
 msgstr "el parámetro ''{0}'' no debe ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -995,38 +950,38 @@
 msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Exportar archivo GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
 msgstr "Historial del objeto"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
 "Mostrar el historial de información de las vías, nodos o relaciones de OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Información sobre el elemento"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
 "Mostrar información sobre los objetos nodos, formas o relaciones de OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Unir nodo a la vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Unir un nodo al segmento de vía más cercano"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Unir nodo y línea"
@@ -1036,170 +991,188 @@
 msgstr "Sin acceso directo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Unir capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Unir la capar actual en otrar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Unir nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Unir nodos en el más antiguo."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor seleccione por lo menos dos nodos para unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Abortando..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "No se pueden unir los nodos: Habría que borrar una vía que todavía está en "
 "uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Unir {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Unir la selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Unir la primitiva seleccionada actual en otra capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Invertir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Invertir los nodos y vías seleccionadas"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Por favor, seleccione al menos un nodo o vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "arriba"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Mover objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "abajo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "Izquierda"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "derecha"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Mover {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Mover objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Imposible mover objetos fuera del mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Nuevo"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Crear un nuevo mapa."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Abrir un archivo."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Abriendo archivos"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Abriendo archivo ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Abrir dirección..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Abrir una URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Separar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr "Seleccionar si los datos deben ser descargados en una nueva capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Introduzca la URL a descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Introduzca una URL desde donde los datos deben ser descargados"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Descargar ubicación"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "URL de descarga"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr "Iniciar la descargar de datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
 
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Descargar datos"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Ortogonalizar forma"
@@ -1209,18 +1182,18 @@
 msgstr "Mover nodos de forma que todos los águlos tengan 90 o 270 grados."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 msgid "Orthogonalize Shape / Undo"
 msgstr "Ortogonalizar forma / Deshacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
 msgid "Undo orthogonalization for certain nodes"
 msgstr "Deshacer ortogonalización para determinados nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr "Ortogonalizar / Deshacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1232,9 +1205,9 @@
 "de Ortogonalizar forma!"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr "Dehacer ortogonalizar forma"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1247,32 +1220,33 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr "Uso"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Los elementos seleccionados no pueden ser ortogonalizados"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Ortogonalizar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Pegar los contenidos de la memoria de pegado"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Pegar etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
@@ -1280,5 +1254,5 @@
 "elementos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1287,5 +1261,5 @@
 msgstr[1] "Pegando {0} etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1294,59 +1268,59 @@
 msgstr[1] "a {0} primitivas"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Abrir la ventana de preferencias globales."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Restaurar la última acción deshecha"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Cambiar nombre de la capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "También cambiar nombre del archivo"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "No se puede reombrar el archivo ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Cambiar el sentido de las vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Invertir el sentido de todas las vías seleccionadas."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Por favor seleccione por lo menos una vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Cambiar el sentido de las vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1354,10 +1328,10 @@
 msgstr "Guardar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Guardar los datos actuales."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1408,21 +1382,21 @@
 msgstr "Guardar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Guardar los datos actuales en un nuevo archivo."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1432,10 +1406,10 @@
 "selecciona los objetos incompletos."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Mostrar informe de estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1443,19 +1417,19 @@
 "errores."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Ayuda: : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Informe de estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Copiar al portapapeles y cerrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1464,18 +1438,18 @@
 msgstr "Cerrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Separar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Separar vía por el nodo seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "La selección actual no se puede usar para separar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1483,5 +1457,5 @@
 msgstr[1] "Los nodos seleccionados no están en medio de ninguna vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1497,9 +1471,9 @@
 "seleccione la vía también."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Los nodos seleccionados no comparten la misma vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1507,10 +1481,10 @@
 msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Debe seleccionar dos o más nodos para dividir una vía circular."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1541,70 +1515,70 @@
 msgstr "Dividir la vía {0} en {1} partes"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Cambiar de estado las líneas GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Dibujar lineas entre puntos obtenidos de los datos en bruto del GPS."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Cambiar de estado el ajuste global ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Despegar vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplicar nodos usados por varias vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Este nodo no está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Ninguno de éstos nodos está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ninguno de los nodos de esta vía está pegado a ninguna otra cosa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "La selección actual no se puede usar para despegar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Selecione alguno:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Un nodo etiquetado, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nodo que sea usado por más de una vía, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Un nodo usado por más de una vía y una de esas vías, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr "* Una vía que tenga un nodo o más usado por más de una vía, o"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "*Una vía y un nodo o más de sus nodos usados por más de una vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1618,9 +1592,9 @@
 "seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Nodo despegado"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1628,58 +1602,59 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "{0} nodos duplicados dentro de {1} nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Deshacer la última acción"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Deseleccionar todo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Deseleccionar todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Deseleccionar todas (Foco)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Deseleccionar todos (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Actualizar datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
 msgstr "Actualizar los objetos de la capa de datos actual desde el servidor."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Actualizando datos"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr "Descargar datos"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Actualización de datos no encontrada"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
@@ -1687,9 +1662,9 @@
 "No se ha encontrado ningún objeto con ID {0} en el conjunto de datos actual"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Actualizar selecciones"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
@@ -1698,13 +1673,13 @@
 "descarga de datos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Actualización de selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "No hay primitivas seleccionadas para actualizar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Selección vacía"
@@ -1716,9 +1691,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr ""
 "Subir todos los cambios en la capa de datos actuales a el servidor de OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1729,5 +1705,5 @@
 "corregirlos primero.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1735,29 +1711,29 @@
 msgstr "Ningún cambio que subir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algunos datos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr "Sincronizar  únicamente el nodo {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr "Sincronizar  únicamente la vía {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Sincronizar  únicamente la relación {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar el conjunto de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1779,11 +1755,11 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Se han detectado conflictos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1799,5 +1775,5 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1811,23 +1787,22 @@
 "uno existente y abierto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Conjunto de cambios cerrados"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Cancelar resolución de conflicto"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr "Preparar la resolución de conflictos"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr "Haz click para cancelar y continuar editando el mapa"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1838,51 +1813,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+msgstr "Nodo todavía en uso"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
+msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
+msgid "Updating primitive"
+msgstr "Oinarrizkoa eguneratzen"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr "''{0}'' geruzarako datuak kargatzen"
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
 #, fuzzy, java-format
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Advertencia: la cabecera errónea \"{0}\" no concuerda con el patrón esperado "
-"\"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Subida <strong>fallida</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Subida a la API de OSM fallida"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
-msgid "Updating primitive"
-msgstr "Actualizando primitiva"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
-#, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr "Subiendo datos de la capa \"{0}\""
-
-#. we tried to delete an already deleted primitive.
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
 msgstr ""
 "Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando "
 "esta primitiva e intentando  volver a enviar los cambios."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, fuzzy, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+"Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando "
+"esta primitiva e intentando  volver a enviar los cambios."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Subiendo datos..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Subiendo selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "Cargar todos los cambios en la selección actual al servidor de OSM."
@@ -1901,11 +1882,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Acercar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Alejar"
@@ -1985,21 +1966,17 @@
 msgstr "Avance lento"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Descargando datos GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Datos GPX descargados"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Datos GPS en bruto"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Descargando datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -2008,27 +1985,39 @@
 "Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "No se han encontrado datos para este area."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Datos OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Descargando {0} de {1} ({2} pendientes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "Los siguientes errores se produjeron durante la descarga masiva:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Errores durante la descarga"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Actualizando datos"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "visible (en el servidor)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Haz click para cancelar y continuar editando el mapa"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2046,7 +2035,22 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Primitivas movidas o borradas"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Los siguientes errores se produjeron durante la descarga masiva:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Errores durante la descarga"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Errores durante la descarga"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2068,5 +2072,5 @@
 msgstr "Modo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2096,38 +2100,38 @@
 msgstr "seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 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:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Crear un nodo nuevo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Seleccionar el nodo bajo el cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2136,14 +2140,14 @@
 msgstr[1] "Insertar un nuevo nodo en {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 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:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Continuar la vía desde el último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Finalizar dibujo."
@@ -2163,5 +2167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2174,5 +2178,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar el botón del ratón para parar de rotar."
@@ -2238,5 +2242,5 @@
 msgstr "Siempre mover y no mostrar la ventana de diálogo de nuevo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2245,5 +2249,5 @@
 "más cercano."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2255,4 +2259,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zoom"
@@ -2272,5 +2277,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Buscar ..."
@@ -2374,20 +2378,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - objetos con un determinado número de nodos"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - todos los objetos modificados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - todos los objetos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - todos los objetos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - todos los objetos sin etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2396,5 +2407,5 @@
 "la expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2403,5 +2414,5 @@
 "cumplan la expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2409,14 +2420,14 @@
 "lógico O (disyunción)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Usar <b>\"</b> para delimitar operadores (por ejemplo si la clave contiene :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> y <b>)</b> para agrupar expresiones"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2426,51 +2437,51 @@
 msgstr "Filtrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "Enviar filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Iniciar búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "No se encontraron coincidencias para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "No se ha añadido nada a la selección al buscar \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "No se ha quitado nada de la selección al buscar \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "No se ha encontrado nada en la selección buscando por ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Se han encontrado {0} coincidencias"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2506,26 +2517,40 @@
 "relación"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Credencial de autentificación inexperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "No se encuentran los argumentos de or"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "No se encuentran los argumentos de not"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Se esperaba un cierre de paréntesis."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Número de parámetros incorrecto para el operador de nodos."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Valor incorrecto de operador de nodos: {0}. El operador de nodos espera un "
+"número de nodos o un intervalo, por ejemplo nodos:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Número de parámetros incorrecto para el operador de nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2536,5 +2561,5 @@
 "número de nodos o un intervalo, por ejemplo nodos:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2638,4 +2663,20 @@
 msgstr "Dependencias de ciclismo"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "Aceptar"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2653,8 +2694,8 @@
 msgstr "Añadir relación {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "{0} objetos eliminados"
+msgstr "Añadidos {0} objetos"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2737,5 +2778,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Doble conflicto"
@@ -2775,4 +2816,15 @@
 msgstr "no se puede resolver los conflictos pendientes"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parámetro ''{0}'' no debe estar vacío"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2803,33 +2855,6 @@
 msgstr[1] "Eliminar {0} relaciones"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Relación con conclicto"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Borrar de la relación"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>La selección \"{0}\" se utiliza en la relación \"{1}\" con la función "
-"{2}.<br>¿Eliminar de la relación?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>La selección \"{0}\" se utiliza en la relación \"{1}\".<br>¿Eliminar "
-"de la relación?</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Dividir segmento de vía"
@@ -2837,6 +2862,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2848,5 +2873,5 @@
 "usándolos.<br>¿Esta seguro que quiere borrarlo?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Confirmación antes de borrar"
@@ -3037,15 +3062,30 @@
 msgstr "Correción automática de etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "El valor por defecto es ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Atención: fallo al almacenar las preferencias en \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Archivo de configuración malformado en las lineas {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3056,5 +3096,5 @@
 "preferencias ''{0}'' no es un directorio."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3065,5 +3105,5 @@
 "preferencias ''{0}'' no es un directorio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3074,5 +3114,5 @@
 "de preferencias desaparecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3083,5 +3123,5 @@
 "directorio de preferencias desaparecido: {0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3091,5 +3131,5 @@
 "preferencias por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3100,5 +3140,5 @@
 "archivo por defecto."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3109,5 +3149,5 @@
 "archivo de preferencias por defecto:{0}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3119,5 +3159,5 @@
 "defecto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3128,19 +3168,42 @@
 "de preferencias por defecto. {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferencias guardadas en {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "No se han podido subir las preferencias. Ya que: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "No se han podido cargar las preferencias desde el servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3151,5 +3214,27 @@
 "excepción fue: {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+"Error al cargar marcadores desde ''{0}'' por razones de seguridad. La "
+"excepción fue: {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "DESCONOCIDO"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3171,20 +3256,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "O"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "E"
@@ -3196,4 +3281,18 @@
 msgid "Changeset {0}"
 msgstr "Conjunto de cambios {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3260,14 +3359,14 @@
 msgstr "Advertencia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "Se esperaba un ID >=0. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "una proimitiva con id=0 no puede ser invisible"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3275,5 +3374,5 @@
 msgstr "Se esperaba un ID >0. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3300,6 +3399,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3363,113 +3462,113 @@
 msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Vía de tipo área sin cerrar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "La vía multipoligonal ''{0}'' no está cerrada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Miembro ''{0}'' borrado en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vía ''{0}''  con menos de dos puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Se ha encontrado más de una vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Se ha encontrado más de una vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Se ha encontrado más de un elemento \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Función ''{0}'' desconocida."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de miembro \"{0}\" desconocido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "No se ha encontrado ninguna vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "No se ha encontrado ninguna vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "La vía \"desde\" no comienza o termina en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "La vía \"a\" no comienza o termina en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "La vía \"a\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "No se ha encontrado el estilo para la restricción {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Intersección entre las vías ''{0}'' y ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "La función \"{0}\" no es útil para el tramo \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "La no-vía ''{0}'' en multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ninguna vía exterior en el multipolígono ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Intersección entre las vías ''{0}'' y ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3485,11 +3584,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "texto"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3508,5 +3606,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3517,5 +3614,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3544,5 +3640,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "fondo"
@@ -3576,12 +3672,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Zona Lambert (Francia)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Zona Lambert (Francia)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3617,5 +3711,5 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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>"
@@ -3624,5 +3718,5 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3651,5 +3745,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "ferrocarril"
@@ -3666,4 +3760,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3679,33 +3775,33 @@
 msgstr[1] "miembros {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Violación de condición previa"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Excepción de seguridad"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Excepción de red"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "Excepción IO"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Error interno del servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Solicitud errónea"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr "No encontrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3713,16 +3809,16 @@
 msgstr "Conflicto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Host desconocido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr "Objeto borrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr "Mostrar información de ayuda"
@@ -3735,4 +3831,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaje del día\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Cerrar el diálogo"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3802,74 +3903,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Nombre de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "opciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Mostrar esta ayuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Argumento de geometría standard de unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Bajar el rectángulo límite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Abrir archivo (como gps en bruto si es .gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 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:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Seleccionar dentro de la búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Restablecer las preferencias a los valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Establezca el idioma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr "opciones proporcionadas como propiedades de sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 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:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3882,9 +3983,9 @@
 "utilizada."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "ejemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3894,25 +3995,25 @@
 "asegúrese que carga algún dato antes de --seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "En vez de  --bajar=<bbox> puede especificar osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Activando los complementos actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Cargando los primeros complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Ajustes predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Cargando los complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3925,11 +4026,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3954,6 +4055,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4054,25 +4155,22 @@
 msgstr "(sin objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "Usuario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "capa no listada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La capa ''{0}'' debe estar en la lista de capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Error mientras se analizaba sintácticamente"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Archivo no encontrado."
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "No, calcelar la operación"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4095,5 +4193,5 @@
 msgstr "sin establecer: no agrega esta propiedad a los objetos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4122,24 +4220,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Eliminar {0} objeto"
-msgstr[1] "Eliminar {0} objetos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Eliminar {0} objeto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "no borrado"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4151,5 +4246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4198,5 +4293,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4213,5 +4308,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4435,8 +4530,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4766,6 +4861,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4779,6 +4874,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4839,36 +4934,36 @@
 msgstr "Su conjunto de datos no incluye una etiqueta con la clave {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr "Conflictos al combinar primitivas"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr "Conflictos al fusionar vías - La vía fusionada es ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, fuzzy, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
 msgstr "Conflictos al fusionar nodos - El nodo fusionado es ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr "Ningún conflicto que resolver"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
 msgstr "Cancelar resolución de conflicto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
 msgstr "Aplicar la resolución de conflictos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Aplicar"
@@ -4880,5 +4975,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "todos"
@@ -4968,4 +5063,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4976,4 +5073,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4987,49 +5085,86 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Reemplazar"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "Mantaner lo mío"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Ordenar los miembros de la relación seleccionada o toda la lista"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr "Indeciso"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr "Aún no decidido"
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Función:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Fijar una función para los miembros seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#, fuzzy
+msgid "Tag modified relations with "
+msgstr "Etiquetas de relaciones"
+
+#: ../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 ""
+
+#: ../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:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Datu kargak <strong>huts egin du</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Valor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "Aplicar esta función a todos los miembros"
@@ -5066,6 +5201,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5155,10 +5290,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5225,5 +5357,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5269,4 +5402,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Activar"
@@ -5292,6 +5426,6 @@
 msgstr "Información de capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5300,22 +5434,22 @@
 msgstr[1] "Esto cambiará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Un valor vacío elimina la clave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "¿Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5324,70 +5458,74 @@
 msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Por favor, selecciona una etiqueta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Por favor, selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Por favor, seleccione los objetos a los que desea cambiar las propiedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Propiedades/Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Propiedades de los objetos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Miembro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Editar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Borrar de la relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, 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/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
@@ -5395,40 +5533,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Abrir una lista de todas las relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaciones: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Borrar la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Crear un anueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Crea una copia de esta relación y la abre en otra ventana de edición."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Borrar la relación seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Selecione alguno:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Descargar las relaciones selecionadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Descargar miembros"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5455,5 +5613,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5465,9 +5623,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Desacoplar el panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5476,5 +5634,5 @@
 "herramientas de la izquierda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Haga click para minimizar/maximizar el contenido del panel"
@@ -5558,5 +5716,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Descargar relación de miembros"
@@ -5586,23 +5745,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Etiquetas y miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5611,14 +5770,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr "Eliminarlos, limpiar la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorarlos, dejar la relación como está"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5628,9 +5787,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5640,15 +5799,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5656,5 +5815,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5662,20 +5821,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5684,67 +5843,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Ordenar los miembros de la relación"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "Editor de relaciones: Ordenar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Mover los miembro(s) seleccionos hacia arriba"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "Editor de relaciones: Mover arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Mover los miembros seleccionados hacia abajo"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "Editor de relaciones: Mover abajo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "Editor de relaciones: Borrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "Sí, crear un conflicto y cerrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Sí, crear un conflicto y cerrar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "No, continuar editando"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5753,9 +5911,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "Conflicto en los datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5764,41 +5922,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "Aplicar las actualizaciones actuales"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Aplicar las actualizaciones y cerrar el diálogo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Añadir una etiqueta vacía"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas las vías y nodos incompletos de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Descargar miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Fijar una función para los miembros seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Aplicar función"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5808,17 +5966,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "Sí, aplícalo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "No, no lo apliques"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr "Confirmar función vacía"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5829,13 +5987,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5849,14 +6007,14 @@
 msgstr "Vinculado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5906,60 +6064,89 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "No conectado"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Ordenar los miembros de la relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Ordenar los miembros de la relación"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Por favor, introduzca las coordenadas deseadas primero."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#, fuzzy
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "Actualmente no hay un conjunto cambios abierto."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Crear frontera"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Mover los miembros seleccionados hacia abajo"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Por favor, introduzca un nombre para la localización."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Seleccione un marcador primero."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Mover los miembro(s) seleccionos hacia arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Mover los miembro(s) seleccionos hacia arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "latitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "longitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "latitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "longitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5968,22 +6155,74 @@
 "URL de www.openstreetmap.org (puede pegar aquí una URL para bajar dicha área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Recuadro delimitador"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Fuentes de datos y tipos"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Datos OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Separar vía por el nodo seleccionado"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Datos GPS en bruto"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "La vía seleccionada no contiene el nodo seleccionado."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Descargar como nueva capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Descargar área"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Descargar"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "No se seleccionó ninguna relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5991,5 +6230,5 @@
 "servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5997,336 +6236,61 @@
 "servidor"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Mover los miembro(s) seleccionos hacia arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Por favor, seleccione la fila a editar"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Introduzca un lugar para buscar:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Introduzca un lugar para buscar:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 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:168
-msgid "Please enter a search string"
-msgstr "Please, introduzca la cadena de caracteres que desea buscar"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "No se pueden leer los resultados de lugares desde el servidor"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Introduzca un lugar para buscar:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Lugares"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "nombre"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "tipo"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "próximo a"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Mapa desplazable"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "Nivel de zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x desde"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "a"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y desde"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Números de teselas"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>Fallo al abrir una conexión con el servidor remoto<br>''{0}''.<br>Por "
-"favor, compruebe su conexión de Internet.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
 #, fuzzy
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-"Advertencia: fracasó poner un diálogo siempre al frente. La excepción fue:{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "Histórico del nodo {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "Histórico de la vía {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "Histórico de la relación {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Cerrar el diálogo"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Cargar historial"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Nodo {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Vía {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relación {0}"
+msgid "Search ..."
+msgstr "Buscar ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Dirección para buscar por la tierra"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6683,4 +6647,6 @@
 #. 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" />
@@ -7061,6 +7027,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7126,11 +7093,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7140,6 +7107,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7149,79 +7116,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Nombre"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Tipo"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "próximo a"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Mapa desplazable"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "Nivel de zoom"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x desde"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "a"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y desde"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Números de teselas"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "Histórico del nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "Histórico de la vía {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "Histórico de la relación {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Cerrar el diálogo"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Cargar historial"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Vía {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relación {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7302,4 +7536,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7593,6 +7828,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0} objeto para modificar:"
@@ -7694,5 +7929,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"Atención: la primitiva \"{0}\" ya ha sido borrada en el servidor. Saltando "
+"esta primitiva e intentando  volver a enviar los cambios."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr "Preparando primitivas para subir"
@@ -7722,60 +7968,60 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Imágenes para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Leer gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "No hay hora para el punto {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "No pudo leerse la hora \"{0}\" desde el punto {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
-msgid "No images with readable timestamps found."
-msgstr ""
-"No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
 #, java-format
 msgid "Reading {0}..."
 msgstr "Leyendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
+msgid "No images with readable timestamps found."
+msgstr ""
+"No se han encontrado imágenes con metadatos legibles sobre la fecha y hora."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Imagenes Geoetiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Iniciar GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Finalizar GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "delta actual: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "diferencia de zona horaria: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7783,51 +8029,51 @@
 msgstr[1] "imagenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} dentro de la traza."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Sincronizar reloj"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Imágenes JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "La fecha en el archivo \"{0}\" no pudo ser analizada sintácticamente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "No hay datos sobre la hora en la cabecera EXIF del archivo \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Imagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Introduce la fecha mostrada (mm/dd/aaaa HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Zona horaria del GPS (diferencia con la foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Sincronizar hora con la del receptor GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "La hora no pudo ser analizada sintácticamente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7835,30 +8081,30 @@
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usar las preferencias globales"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Dibujar las líneas entre puntos en esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "No dibujar las líneas entre puntos en esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Seleccione las opciones de dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7866,5 +8112,5 @@
 msgstr "Personalizar colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7873,5 +8119,5 @@
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7880,43 +8126,43 @@
 msgstr "Seleccionar una color"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Marcadores desde puntos nombrados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Puntos de traza nombrados desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "archivos Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importar imágenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Nombre: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Descripción: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7926,28 +8172,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Descripción"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Longitud: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7956,5 +8202,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7963,10 +8209,10 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7976,11 +8222,11 @@
 "peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7990,29 +8236,29 @@
 msgstr "Convertido desde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Descargar datos de OSM a lo largo de esta traza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -8023,13 +8269,9 @@
 "<br¿Desea continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr "Descargar datos"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "No hay traza gpx disponible en la capa para asociar el audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8040,5 +8282,5 @@
 "comienzo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8048,23 +8290,23 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "fuera del área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8073,39 +8315,56 @@
 msgstr[1] "Se han detectado {0} conflictos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} borrados.)"
+msgstr[1] " ({0} borrados.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} formado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} borrados.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "sin ajustar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "Versión del API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8279,6 +8538,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8293,6 +8550,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8482,5 +8737,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8827,21 +9082,20 @@
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Activar los valores predefinidos por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 msgid "Enable built-in icon defaults"
 msgstr "Activar los iconos predefinidos por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+msgid "Used style"
+msgstr "Estilo usado"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
 msgid "Map Paint Styles"
 msgstr "Estilos de semiología cartográfica"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
-msgid "Used style"
-msgstr "Estilo usado"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -8855,6 +9109,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Actualizar"
@@ -9005,69 +9258,108 @@
 msgstr "Atajo de teclado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Activar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr "Rutas del icono"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Descripción corta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "Autor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Página web: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Versión: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr "Rutas del icono"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Copiar predeterminados"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Por favor, seleccione una fila para copiar"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-"La fuente XML (URL o ruta del archivo) para los archivos de definición {0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Borrar la fuente seleccionada de la lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr "Por defecto (vea el texto emergente para información más detallada)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr ""
+"Eliminar las entradas seleccionadas de la lista de elementos fusionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Editar el valor de la clave seleccionada para todos los objetos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+"Eliminar las entradas seleccionadas de la lista de elementos fusionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Añadir una nueva etiqueta"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Refrescar la lista de selección."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Editar la fuente seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "''{0}'' geruzarako datuak kargatzen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Error al subir o descargar datos de<br>''{0}''<br>debido a un problema "
+"con la transferencia de datos<br>Detalles (sin traducir): {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Ordenar menú de preajustes"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9273,5 +9565,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Más información sobre esta característica"
@@ -9336,16 +9628,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Grupo de predefinidos ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Grupo de predefinidos ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9353,5 +9645,5 @@
 msgstr "Contactando con el servidor OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9462,5 +9754,5 @@
 msgstr "Análisis sintáctivo fallido del archivo \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -9690,5 +9982,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9715,5 +10007,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9721,5 +10013,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9732,5 +10024,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9741,33 +10033,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Contraseña o nombre de usuario incorrectos"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advertencia: La contraseña se transferirá sin cifrar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Grabar nombre de usuario y contraseña (sin cifrar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "La URL base del servidor OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Nombre de usuario (correo-e) a la cuenta OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9776,17 +10068,17 @@
 "clave."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "URL base del servidor"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "Nombre de usuario OSM (correo-e)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "Contraseña OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9891,5 +10183,5 @@
 msgstr "El archivo \"{0} no existe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9898,38 +10190,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "Valor ilegal del atributo \"ref\" del elemento <nd>. Es  {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9937,19 +10229,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación <miembro> incompleta sin ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Objeto con id=0 ilegal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9958,7 +10250,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9968,25 +10264,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Versión del API desconocida o no soportada. Es {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9994,5 +10290,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -10001,5 +10297,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -10007,5 +10303,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -10014,13 +10310,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr "Analizando los datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr "Preparando conjunto de datos..."
@@ -10031,14 +10327,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Descargar desde OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr "Descargando relaciones referidas..."
@@ -10153,15 +10448,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Actualizar complementos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Descarga de complementos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10174,30 +10469,34 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "Complemento {0} descargado correctamente. Por favor, reinicie JOSM."
 msgstr[1] ""
 "Complementos {0} descargados correctamente. Por favor, reinicie JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Descargando complemento {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Saltar descarga"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Descargar complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Omitir la descarga"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10209,10 +10508,10 @@
 msgstr "Ha ocurrido un error en el complemento {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10222,10 +10521,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "La última actualización de los complementos fue hace más de {0} días"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Actualizar complementos"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "El complemento {0} requiere una actualizar JOSM a la versión {1}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
@@ -10234,23 +10555,10 @@
 "encontrado"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Complemento no encontrado: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "La última actualización de los complementos fue hace más de {0} días"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Puede modificar el número de días tras el cual aparecerá el "
-"aviso<br>cambiando la opción de configuración 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
@@ -10258,16 +10566,16 @@
 "No se puede cargar el complemento {0}. ¿Desea borrarlo de las preferencias?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Deshabilitar complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Mantener componente"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10277,9 +10585,9 @@
 "permiso para escribir sobre los existentes"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10289,10 +10597,10 @@
 "\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "De acuerdo a la información del componente, el autor es {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10301,9 +10609,9 @@
 "informar del error."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "¿Se debe deshabilitar el complemento?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10313,23 +10621,23 @@
 "JOSM para descargarle del programa."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 "El componente no puede ser eliminado. Probablemente ya estaba desabilitado"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Información del complemento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "no hay descripción disponible"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Más detalles"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10338,18 +10646,18 @@
 msgstr[1] "Información del complemento descargada de {0} sitios"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "No se ha encontrado información del complemento."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "El complemento llamado {0} no está disponible. Omitir actualización."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Todos los complementos instalados están actualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10362,9 +10670,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Descargar los complementos que faltan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10379,9 +10687,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10403,19 +10711,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versión {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Complemento incluido en JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10479,5 +10787,5 @@
 msgstr "(El texto ya ha sido copiado a tu portapapeles.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10486,5 +10794,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10493,5 +10801,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10501,5 +10809,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10512,10 +10820,10 @@
 "<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10524,5 +10832,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10531,16 +10839,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10553,5 +10861,5 @@
 "miniaplicacióin <br> y no lo ha cargado desde ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10562,5 +10870,5 @@
 "favor, compruebe su conexión de Internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10571,5 +10879,5 @@
 "con la transferencia de datos<br>Detalles (sin traducir): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10581,10 +10889,10 @@
 "favor.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "El servidor OSM ''{0}'' informa de una mala solicitud.<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10596,10 +10904,10 @@
 "exportado proporcionado por la comunidad de OSM."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Mensaje de error (sin traducir): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10610,5 +10918,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10618,5 +10926,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10627,5 +10935,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10729,11 +11037,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10885,5 +11186,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Direcciones interpoladas"
@@ -10899,10 +11201,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Impar"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10910,59 +11212,59 @@
 msgstr "Par"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr "Alfabético"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr "Relación: {0}"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr "Asociar a la calle usando:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr "Esquema de numeración:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr "Comenzando #:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr "Nº final:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr "Asociará {0} nodos de numeros de portal adicionales"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr "Ciudad:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr "Estado/Provincia:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr "Código postal:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr "País:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr "Dirección completa:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr "Información opcional:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
@@ -10970,22 +11272,22 @@
 "interpoladas"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 "Por favor, seleccione una vía de direcciones interpoladas para esta calle"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr "Se preveía número de portal impar"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr "Se preveía número de portal par"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr "El código de país debe tener 2 letras"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
@@ -10993,9 +11295,9 @@
 "de portal"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr "El número de portal alfabético debe terminar con una letra"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
@@ -11003,18 +11305,18 @@
 "alfabética"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 "La letra del portal de inicio debe ser inferior a la letra del último portal"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr "Por favor, introduzca un número valido para el portal de inicio"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr "Por favor, introduzca un número valido para el portal final"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -11069,46 +11371,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrayendo localizaciones GPS del EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Iniciando escaneo del directorio"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "¡¡Uno de los archivos seleccionados era nulo!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Leyendo fotos..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Imposible obtener ruta apropiada para el directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Escaneando directorio {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Encontrado archivo nulo en el directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Error mientras se obtenían archivos del directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Correlacionar con GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11378,5 +11681,5 @@
 msgstr "Error en archivo {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11389,10 +11692,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11440,13 +11743,13 @@
 msgstr "Elegir desde..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Catastro"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Digitalización automática"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11455,13 +11758,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM está detenido para que el cambio surta efecto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11587,7 +11890,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Visualizar las coordenadas como"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11607,5 +11909,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11649,13 +11951,13 @@
 msgstr "Crear frontera"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11786,22 +12088,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Cambiar localización"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Establecer una nueva localización para la nueva solicitud"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Añadir una nueva capa"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Localización"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11811,5 +12113,5 @@
 "puntuación conocida por www.cadastre.gouv.fr.</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Añadir nueva capa"
@@ -11823,9 +12125,9 @@
 msgstr "Obtener nueva cookie (sesión caducada)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr "Exportar como formato PNG (solo imágenes raster)"
@@ -11848,5 +12150,5 @@
 msgstr "Ajustar la posición de la capa WMS (sólo imágenes raster)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11870,5 +12172,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Capa vacía"
@@ -11897,5 +12199,5 @@
 msgstr "Cuadro de la Comunna: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11906,18 +12208,18 @@
 "Creado uno nuevo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Error en el formato caché"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Error en la zona Lambert  de la caché"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -12015,5 +12317,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "No se han cargado los datos."
@@ -12422,7 +12724,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "lámina de agua"
@@ -12635,33 +12937,33 @@
 msgstr "Capa LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Capturar traza GPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Conectar al servidor gpsd y mostrar la posición actual en la capa LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Centrar una vez"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centrar la capa LiveGPS a la posición actual."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Autocentrar"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centrar continuamente la capa LiveGPS a la posición actual."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12751,24 +13053,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12925,4 +13227,9 @@
 msgstr "Ejecutable Firefox"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Capa"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12972,30 +13279,30 @@
 msgstr "Acciones permitidas"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "El control remoto ha pedido cagar datos desde el API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detalles requeridos: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "¿Desea permitir esto?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "confirmar la acción del control remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "El control remoto ha pedido importar datos de la siguiente URL:"
@@ -13014,7 +13321,5 @@
 msgstr "No se seleccionó ninguna relación"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -13023,4 +13328,5 @@
 #: ../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 "Enrutamiento"
@@ -13042,25 +13348,25 @@
 msgstr "Abrir una lista de nodos de enrutamiento"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
 msgstr "Agregar capa de enrutado"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Criterios"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "La más corta"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "La más rápida"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Ruta inversa"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Borrar ruta"
@@ -13090,93 +13396,87 @@
 msgstr "Introduzca el peso de los valores"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Mapa desplazable"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Zoom automático: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Cargar tesela"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "Mostrar estado de la tesela"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Solicitar actualización"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Mostrar info"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Cargar todas las teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Incrementar zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Reducir zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "imagen "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "zoom automático"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "Carga automática de teselas"
 
 #. 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "Mapa desplazable"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Ajustes para el complmento SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Fuentes de teselas"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Zoom automático: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Carga automática de teselas: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Max. nivel de zoom: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Max. nivel de zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Fondo de pantalla apagado: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "error al cargar los metadatos"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr "Error de actualización solicitado: no hay nivel de zoom 12"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "solicitado:{0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "errore al solicitar actualización"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -13189,5 +13489,5 @@
 msgstr "Grabar datos capturados cada minuto."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13355,5 +13655,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nombre de la calle"
@@ -13400,29 +13700,29 @@
 msgstr "Por favor, seleccione al menos un vial cerrado para ser unido."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "No se encontró ninguna intersección. Nada ha cambiado."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Nodo añadido en todas las intersecciones"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Eliminar vías que no formen parte de un multipolígono interior"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Arreglar relaciones"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Fusionar área superpuesta consigo misma"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Fusionar áreas superpuestas"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13432,33 +13732,33 @@
 "favor, compruebe los errores no se han introducido."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Introduzca valores para todos los conflictos."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Resolver conflictos"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Arreglar conflictos de etiquetas"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Eliminar elementos de las relaciones"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Fusionar áreas: eliminar las vías cortas"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Vía cerrada"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Eliminar etiquetas de vías internas"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Función para la fusión de áreas"
@@ -13674,8 +13974,4 @@
 msgstr "Corregir los errores seleccionados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignorar"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13720,25 +14016,24 @@
 msgstr "Remplazar\"{0}\" por \"{1}\" para"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Línea de costa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Este test comprueba si las costas están correctas."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Línea de costa desordenada"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Línea de costa desordenada"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Línea de costa desordenada"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13762,18 +14057,18 @@
 msgstr "Cruce de vías"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Nodos duplicados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Esta examen comprueba que no haya nodos en el mismo lugar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Nodos en la misma posición"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Confirmación"
@@ -14033,4 +14328,8 @@
 msgstr "Editar la fuente seleccionada."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Borrar la fuente seleccionada de la lista."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14247,7 +14546,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "edificio"
@@ -14261,5 +14560,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "área"
@@ -14269,9 +14568,9 @@
 msgstr "Via sin cerrar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Vias sin conectar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -14279,17 +14578,17 @@
 "vía."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Nodo de extremo de vía próxima a otra carretera"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Nodo de extremo de vía próximo a otro vial"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Nodo de vía próximo a otro vial"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Conectado nodo de extremo de vía próximo a otro vial"
@@ -14390,22 +14689,26 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
-#, fuzzy
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "Capa WMS ({0}), descargando en zoom {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr "Walking Papers: {0}"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "Seleccione un nodo de inicio en el extremo de la vía"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "Extender al final de la línea"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "Alcanzar una intersección"
@@ -14651,9 +14954,9 @@
 msgstr "Error en el formato del archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Abrir una capa WMS en blanco para cargar datos desde un archivo"
@@ -15167,6 +15470,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Referencia"
@@ -15728,5 +16031,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr "metal"
@@ -15738,5 +16041,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "bosque"
@@ -16024,7 +16327,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "sí"
@@ -16173,8 +16476,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "no"
@@ -16301,31 +16604,4 @@
 msgstr "Editar una intersección"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Tipo"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16446,5 +16722,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "calle urbana"
@@ -16479,5 +16755,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "vía de servicio"
@@ -16512,5 +16788,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "en construcción"
@@ -16901,12 +17177,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operador"
@@ -17119,6 +17395,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Altitud"
@@ -17545,5 +17821,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "marísma"
@@ -18076,25 +18352,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -18160,24 +18436,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr "24/7"
@@ -18190,24 +18466,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
@@ -18220,24 +18496,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
@@ -18270,6 +18546,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Número de referencia"
@@ -18285,5 +18561,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "subterráneo"
@@ -18297,5 +18573,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "De pago"
@@ -18531,5 +18807,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Refugio"
@@ -18997,5 +19273,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -19010,5 +19286,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Esquí"
@@ -19162,16 +19438,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Lugar arqueológico"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Editar lugar arqueológico"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -19179,55 +19468,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Mojón"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Editar mojón"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -19235,35 +19524,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Editando pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Deportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -19277,6 +19566,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -19668,30 +19957,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "deporte"
@@ -19701,227 +19990,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "fútbol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Campo de juego"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Editar campo de juego"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Editar multi"
+
+#. 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 "tipo"
 
 #. item "Sport/Multi" combo "type"
@@ -19958,203 +20300,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "campo de juego"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "Polideportivo"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "Estadio"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "pista"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Natación"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -20162,56 +20504,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Tiro"
@@ -20219,182 +20561,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Fútbol americano"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Editar fútbol americano"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Editar rugby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Edificios"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Edificio"
@@ -20402,5 +20744,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Edificio público"
@@ -20408,10 +20750,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -20419,10 +20761,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Embajada"
@@ -20430,10 +20772,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -20442,10 +20784,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Prisión"
@@ -20454,10 +20796,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Policía"
@@ -20467,10 +20809,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -20479,10 +20821,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -20490,5 +20832,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -20496,15 +20838,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Escuela"
@@ -20512,10 +20854,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universidad"
@@ -20523,10 +20865,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -20534,5 +20876,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -20540,5 +20882,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cine"
@@ -20547,10 +20889,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Biblioteca"
@@ -20559,9 +20901,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -20569,10 +20911,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teatro"
@@ -20581,10 +20923,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -20594,5 +20936,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -20601,6 +20943,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religión"
@@ -20609,66 +20951,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Confesión"
@@ -20677,81 +21019,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Direcciones"
@@ -20760,5 +21102,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Editar direcciones"
@@ -20766,5 +21108,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Número de portal"
@@ -20772,20 +21114,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Código del país"
@@ -20794,5 +21136,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Editar direcciones interpoladas"
@@ -20800,61 +21142,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -20862,25 +21204,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Faro"
@@ -20888,10 +21230,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -20899,10 +21241,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Tubería"
@@ -20911,37 +21253,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "aguas residuales"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "térmico"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "cualquier substancia"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "sumergido"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "elevado"
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -20951,10 +21293,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Grúa"
@@ -20962,10 +21304,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Editar grúa"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Baliza"
@@ -20973,10 +21315,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -20984,10 +21326,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -20995,5 +21337,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
@@ -21001,5 +21343,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -21009,35 +21351,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -21046,10 +21388,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -21058,5 +21400,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -21064,10 +21406,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -21078,23 +21420,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr "polo"
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr "Torre de referencia"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -21103,75 +21445,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr "Tipo de línea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr "línea"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr "baja tensión"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Voltaje"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr "Cantidad de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de alambres (mejor: conductores) por cable de tensión"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr "sencillo"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr "doble"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Baños"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Teléfono"
@@ -21180,5 +21522,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -21186,5 +21528,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Monedas"
@@ -21192,5 +21534,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Billetes"
@@ -21198,5 +21540,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -21204,5 +21546,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -21210,15 +21552,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -21227,5 +21569,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -21233,35 +21575,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Banco"
@@ -21270,31 +21612,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr "piedra"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr "Color"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr "marrón"
@@ -21365,40 +21707,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "zona verde"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "hierba"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr "blanco"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr "Número de asientos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
@@ -21407,30 +21748,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Oculto"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Esclusa"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Fuente"
@@ -21439,10 +21780,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -21451,10 +21792,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -21462,33 +21803,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Tiendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -21496,9 +21837,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosco"
@@ -21506,27 +21847,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Editar kiosco"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr "Librería"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "Agencia de viajes"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "Editar agencia de viajes"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -21534,5 +21875,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -21540,88 +21881,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "Tarjetas de fidelización o descuento"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Carnicería"
@@ -21629,9 +21970,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Panadería"
@@ -21639,9 +21980,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Editar panadería"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Floristería"
@@ -21649,18 +21990,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Tienda de bebidas alcohólicas"
@@ -21668,54 +22009,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Editar tienda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Tienda de informática"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de informática"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Editar Tienda Hifi"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -21723,9 +22064,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Editar centro de jardinería"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Hardware"
@@ -21733,9 +22074,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Editar almacén de hardware"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -21743,54 +22084,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaje"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Editar tienda de videos"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -21798,9 +22139,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Lavandería"
@@ -21808,9 +22149,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Editar lavandería"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -21818,28 +22159,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Editar tienda de actividades al aire libre"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Óptica"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Banco"
@@ -21847,14 +22188,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -21862,5 +22203,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -21868,15 +22209,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Médico"
@@ -21884,18 +22225,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Editar médico"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -21903,5 +22244,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -21909,9 +22250,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Hospital"
@@ -21919,10 +22260,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -21931,5 +22272,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -21938,20 +22279,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -21959,5 +22300,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -21966,59 +22307,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr "Geografía"
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Lugares"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Región"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Municipio"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -22026,15 +22372,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -22042,10 +22388,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr ""
@@ -22055,5 +22401,5 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr ""
@@ -22062,15 +22408,15 @@
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr ""
@@ -22078,5 +22424,5 @@
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr ""
@@ -22086,5 +22432,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Paraje"
@@ -22092,10 +22438,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Isla"
@@ -22103,10 +22449,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Editar isla"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr "Islote"
@@ -22114,5 +22460,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr "Editar islote"
@@ -22120,5 +22466,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -22126,10 +22472,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Pico"
@@ -22137,10 +22483,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Glaciar"
@@ -22148,10 +22494,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Volcán"
@@ -22159,70 +22505,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Árbol"
@@ -22231,15 +22577,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Bosque"
@@ -22248,5 +22594,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -22254,17 +22600,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -22273,14 +22619,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -22288,25 +22634,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Braña"
@@ -22314,10 +22660,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -22325,5 +22671,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -22331,5 +22677,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -22338,45 +22684,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -22384,25 +22730,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Jardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Pastizal"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Editar pastizal"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Parque municipal"
@@ -22410,10 +22756,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -22421,20 +22767,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -22442,5 +22788,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -22448,15 +22794,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Cementario"
@@ -22464,9 +22810,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -22474,39 +22820,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -22514,15 +22860,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -22530,55 +22876,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -22588,5 +22934,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -22595,10 +22941,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "segmento interior"
@@ -22606,5 +22952,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -22613,5 +22959,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -22619,34 +22965,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "solo recto"
@@ -22655,15 +23001,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "a través de nodo o vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "a la vía"
@@ -22671,5 +23017,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Ruta"
@@ -22678,5 +23024,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -22684,5 +23030,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -22754,5 +23100,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22761,17 +23107,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "ski"
@@ -22824,5 +23170,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22831,13 +23177,13 @@
 msgstr "pie"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "senderismo"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "desvío"
@@ -22851,10 +23197,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -22862,31 +23208,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -22895,30 +23241,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -23356,11 +23702,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "obsoleto"
@@ -25384,5 +25730,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "agua (claro)"
@@ -26054,4 +26400,12 @@
 #.
 #. <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"/>
@@ -26076,5 +26430,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -26088,5 +26442,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "cantera"
@@ -26100,5 +26454,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "vertedero"
@@ -26120,5 +26474,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "cuenca"
@@ -26132,5 +26486,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "plantación forestal"
@@ -26144,5 +26498,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -26165,5 +26519,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "venta al por menor"
@@ -26177,5 +26531,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "industrial"
@@ -26189,5 +26543,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -26201,5 +26555,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "área rururbana"
@@ -26213,5 +26567,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -26268,7 +26622,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "zona militar"
@@ -26282,5 +26636,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "cementerio"
@@ -26293,5 +26647,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "pico"
@@ -26306,5 +26660,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "glaciar"
@@ -26318,5 +26672,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "volcán"
@@ -26371,8 +26725,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "espacio natural"
@@ -26386,5 +26740,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "matorral"
@@ -26398,5 +26752,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "monte"
@@ -26410,8 +26764,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "área"
+msgstr ""
 
 #. color water
@@ -26423,5 +26776,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "lodazal"
@@ -26435,5 +26788,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "playa"
@@ -26511,8 +26864,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "ruta"
@@ -26560,7 +26913,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "frontera"
@@ -26710,11 +27063,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "lugar"
@@ -26762,6 +27115,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "dirección"
@@ -27069,34 +27422,95 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Error mientras se cargaba la página {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A>."
+#~ msgid "File could not be found."
+#~ msgstr "El archivo no se encuentra."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Por favor, seleccione al menos una tarea para descargar"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Subida a la API de OSM fallida"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Relación con conclicto"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A> o <A HREF="
-#~ "\"{1}\">su idioma</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\" con la "
+#~ "función {2}.<br>¿Eliminar de la relación?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
 #~ msgstr ""
-#~ "Sólo se pueden editar páginas de ayuda desde la ayuda en línea de JOSM"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Usar preferencia ''{0}''"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ "<html>La selección \"{0}\" se utiliza en la relación \"{1}\"."
+#~ "<br>¿Eliminar de la relación?</html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Error mientras se analizaba sintácticamente"
+
+#~ msgid "File not found"
+#~ msgstr "Archivo no encontrado."
+
+#~ msgid "Replace"
+#~ msgstr "Reemplazar"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Por favor, introduzca las coordenadas deseadas primero."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Seleccione un marcador primero."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Please, introduzca la cadena de caracteres que desea buscar"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "No se pueden leer los resultados de lugares desde el servidor"
+
+#~ msgid "name"
+#~ msgstr "nombre"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Copiar predeterminados"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Por favor, seleccione una fila para copiar"
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr ""
-#~ "Asignar manualmente la zona Lambert (p. ej. para localizaciones entre dos "
-#~ "zonas)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Abrir una capa primero (GPX, OSM, cache)"
+#~ "La fuente XML (URL o ruta del archivo) para los archivos de definición "
+#~ "{0}."
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "Por defecto (vea el texto emergente para información más detallada)"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Puede modificar el número de días tras el cual aparecerá el "
+#~ "aviso<br>cambiando la opción de configuración 'pluginmanager.warntime'.)"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Mostrar estado de la tesela"
+
+#~ msgid "Request Update"
+#~ msgstr "Solicitar actualización"
+
+#~ msgid "error loading metadata"
+#~ msgstr "error al cargar los metadatos"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "Error de actualización solicitado: no hay nivel de zoom 12"
+
+#~ msgid "requested: {0}"
+#~ msgstr "solicitado:{0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "errore al solicitar actualización"
 
 #~ msgid "Move"
@@ -27118,7 +27532,4 @@
 #~ msgstr "Combinar conflictos"
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "Refrescar la lista de selección."
-
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Resolver conflictos"
@@ -27168,7 +27579,4 @@
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Validar nombre (correo-e) de la cuenta OSM"
-
-#~ msgid "Aborting..."
-#~ msgstr "Abortando..."
 
 #~ msgid "Change"
@@ -27182,4 +27590,7 @@
 #~ msgstr "Nombre de usuario OSM (correo electrónico)"
 
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Error mientras se cargaba la página {0}"
+
 #~ msgid "Open in Browser"
 #~ msgstr "Abrir en el navegador"
@@ -27199,4 +27610,10 @@
 #~ msgid "<nd> has zero ref"
 #~ msgstr "<nd> no tiene ref"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Usar preferencia ''{0}''"
 
 #~ msgid "{0} object has conflicts:"
@@ -27635,4 +28052,7 @@
 #~ msgstr "Por favor seleccione algún usuario en el panel de autor"
 
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Abrir una capa primero (GPX, OSM, cache)"
+
 #~ msgid "Invalid projection"
 #~ msgstr "Proyección inválida"
@@ -27668,4 +28088,9 @@
 #~ "El componente no pudo ser eliminado. Por favor informe del problema a los "
 #~ "administradores de JOSM."
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr ""
+#~ "Asignar manualmente la zona Lambert (p. ej. para localizaciones entre dos "
+#~ "zonas)"
 
 #~ msgid "Remove route nodes"
@@ -27729,4 +28154,8 @@
 #~ msgstr "Ayuda en línea de JOSM"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr ""
+#~ "Sólo se pueden editar páginas de ayuda desde la ayuda en línea de JOSM"
+
 #~ msgid ""
 #~ "Please select at least one node, way or relation. Only already uploaded "
@@ -27793,7 +28222,4 @@
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Aplicar resolución parcial"
-
-#~ msgid "Keep mine"
-#~ msgstr "Mantaner lo mío"
 
 #~ msgid "Checking whether primitive {0} is gone ..."
@@ -27869,7 +28295,4 @@
 #~ msgstr "Ordenar"
 
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Ordenar los miembros de la relación seleccionada o toda la lista"
-
 #~ msgid "Members: {0} (linked: {1})"
 #~ msgstr "Miembros: {0} (enlazados: {1})"
@@ -27919,7 +28342,4 @@
 #~ msgid "Use a new changeset and close it"
 #~ msgstr "Usar un nuevo conjunto de cambio y cerrarlo"
-
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Actualmente no hay un conjunto cambios abierto."
 
 #~ msgid "Close current changeset"
@@ -27941,4 +28361,14 @@
 #~ "cambios y continuar?"
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Falta la página de ayuda. Créela en <A HREF=\"{0}\">English</A> o <A HREF="
+#~ "\"{1}\">su idioma</A>."
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Página de ayuda perdida. Crearla en <A HREF=\"{0}\">English</A>."
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 18273)
+++ applications/editors/josm/i18n/po/et.po	(revision 18508)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-17 15:01+0000\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-25 14:06+0000\n"
 "Last-Translator: lyyser <logard.1961@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Loon kasutajaliidest"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Abi"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignoreerin vigast URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Hoiatus"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoreerin vigast faili URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Viga"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "TUNDMATU"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Näita info akent."
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Versioon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Viimane muudatus {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java versioon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Koduleht"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Vigadest teatamine"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Teave"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Loemind"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revisjon"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Panus"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Litsents"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Pistikrakendused"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "JOSM -i kohta ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Faili ei leitud"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -318,42 +301,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -361,5 +343,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -372,19 +354,19 @@
 msgstr "Palun vali vähemalt üks juba üles laetud sõl, tee või relatsioon."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Palun vali sihtkiht."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Vali sihtkiht"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Ühenda"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -393,50 +375,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Sihtkihte ei ole"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Lisa märkus..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Lisa sõlm laiuskraadi ja pikkuskraadi järgi."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Toimeta {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Lisa koordinaadid uuele sõlmele."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Kasuta kraade kümnendsüsteemis."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negatiivsed väärtused märgivad lääne/lõunapoolkera."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -445,5 +427,5 @@
 msgstr "Laiuskraad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -452,27 +434,27 @@
 msgstr "Pikkuskraad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Paiguta sõlmed ringikujuliselt."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Liiguta valitud sõlmed ringiks."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -482,5 +464,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -496,30 +478,28 @@
 msgstr "Tööriist {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Palun vali vähemalt neli sõlme."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -529,84 +509,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Paiguta sõlmed ühele joonele."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Liiguta valitud sõlmed ühele joonele."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Palun vali vähemalt kolm sõlme."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "kiht"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "allalaetule"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Suumi {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Suumi vaade {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Vaade: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Ei ole valitud midagi, millele suumida"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Ei ole vastuolusid, millele suumida"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -614,37 +594,37 @@
 msgstr "Fail: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Sobita tee"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Sobita mitu teed üheks."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Muuda suundi?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Pööra ja sobita."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -654,5 +634,5 @@
 "pöörata?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -660,41 +640,41 @@
 msgstr "Ei saa teid ühendada. Ei saa liita üheks sõlmejadaks."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Ühenda {0} teed."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Palun vali vähemalt kaks teed, mida sobitada."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopeeri valitud objektid puhvrisse."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Palun vali kopeerimiseks mõni objekt."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Moodusta ring"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Moodusta valitud kolmest sõlmest ring."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Sõlmed ei moodusta ringi. Katkestan."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -702,16 +682,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -723,5 +701,5 @@
 msgstr "Kustuta"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Kustuta valitud objektid."
@@ -729,6 +707,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -742,73 +720,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Jaga sõlmed."
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Aseta valitud sõlmed võrdsete vahemaade tagant mööda joont."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Lae OSM serverist..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Lae kaardi andmed OSM serverist"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Lae alla"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Palun vali allalaadimiseks vähemalt üks toiming."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -817,39 +772,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Impordi ajal leidis aset {0} konflikti."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Konfliktid allalaadimisel"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Kahekordista"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Kahekordista ja kleebi valitud objekt."
@@ -859,41 +814,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Välju"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Rakenduse sulgemine."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Kõik formaadid"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Ekspordi GPX-i..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Ekspordi andmed GPX faili."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Midagi ei ole eksportida."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -932,6 +887,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -950,9 +905,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -972,5 +927,5 @@
 msgstr "parameeter ''{0}'' ei tohi olla null"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -978,36 +933,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Ekspordi GPX fail"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide ajaloo kohta."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Info elemendi kohta"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Kuvab info OSM teede, sõlmede ja relatsioonide objektide kohta."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Ühenda sõlmed teeks."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Ühenda sõlm lähima teega."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Ühenda sõlm ja joon."
@@ -1017,168 +972,186 @@
 msgstr "Ei ole shortcuti."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Liida kihid"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Liida sõlmed."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Liida sõlmed vanimaks."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Palun vali vähemalt kaks sõlme mida liita."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Katkestan..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "Ei saa sõlmi liita: tuleb kustutada tee, mis on endiselt kasutusel."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Sulanda {0} sõlm(e)"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Ühenda valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Ühenda valitud primitiivid teise kihti"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Peegelda"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Peegelda valitud sõlmed ja teed."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Palun vali vähemalt üks sõlm või tee."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "Üles"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Liiguta objektid {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "Alla"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "Vasakule"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "Paremale"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Liiguta {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Liiguta objektid {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Objekte ei saa maailmast välja viia"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Uus"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Loo uus kaart."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Ava..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Faili avamine."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Faili avamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Ava asukoht..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Ava URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Eralda kiht."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Sisesta URL kust alla laadida:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Allalaadimise asukoht"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Allalaadimise URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Andmete allalaadimine"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Muuda kujund ortogonaalseks."
@@ -1188,18 +1161,18 @@
 msgstr "Liiguta kõik sõlmed 90 või 270 kraadise nurga alla."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1208,9 +1181,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1219,36 +1192,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Ristkülikusta."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Kleebi"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Kleebi puhvri sisu."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Kleebi sildid."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Lisa kõikidele valitud objektidele puhvris olevad sildid."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1257,5 +1231,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1264,59 +1238,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Eelistused..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Ava eelistuse leht, et muuta globaalseid sätteid"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Eelistused"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Uuesti"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Tee uuesti viimane tagasivõtmine"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Nimeta kiht ümber."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Nimeta fail ka ümber."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Pööra tee suund."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Pööra kõigi valitud teede suund."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Palun vali vähemalt üks tee."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Pööra teede suund."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1324,10 +1298,10 @@
 msgstr "Salvesta"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Salvesta praegused andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1378,21 +1352,21 @@
 msgstr "Salvesta kiht"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Salvesta nimega..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Salvesta need andmed uude faili."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Vali kõik."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1401,28 +1375,28 @@
 "Vali kõik kustutamata objektid sellel kihil. Poolikud objektid valitakse ka."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Näita staatust"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr "Näita kasuliku infoga staatust, mis ei ole seotud programmivigadega."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Abi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Staatus"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Kopeeri puhvrisse ja sulge."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1431,18 +1405,18 @@
 msgstr "Sulge"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Lahuta tee."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Lahuta tee valitud sõlme kohalt."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Valik ei ole lahutamiseks sobiv."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1450,5 +1424,5 @@
 msgstr[1] "Valitud sõlmed ei ole tee keskel."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1464,9 +1438,9 @@
 "sõlmed kuuluvad"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Valitud sõlmed ei ole samast teest."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1474,10 +1448,10 @@
 msgstr[1] "Valitud tee ei sisalda valitud sõlmi"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Sa pead valima kaks või rohkem sõlme, et ringikujulist teed poolitada"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1504,61 +1478,61 @@
 msgstr "Lõika tee {0} {1} osaks"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Näita/peida GPX jooned."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Joonista joon gps punktide vahel"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Näita/peida seade {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Kleebi tee uuesti kokku."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Kahekordista sõlmed, mis on mitme tee poolt kasutatud."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "See on üksik sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Ükski neist sõlmedest ei ole millegi küljes."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ükski selle tee sõlmedest ei ole millegi muu küljes."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Seda valikut ei ole võimalik uuestiliitmiseks kasutada."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Vali miski:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* üks sildiga sõlm või"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* üks sõlm, mis on kasutusel rohkem kui ühes tees või"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* üks sõlm, mis on kasutusel rohkem kui ühes tees ja ühes neist teedest"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1567,5 +1541,5 @@
 "teedest"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1574,5 +1548,5 @@
 "ühes neist teedest"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1585,9 +1559,9 @@
 "Muul juhul saavad kõik teed omad koopiad ja kõik sõlmed valitakse."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Lahtisulatatud sõlm"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1595,80 +1569,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Kordista {0} sõlme {1} sõlmeks"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Võta tagasi"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Tühista eelmine tegevus"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Tühista kõik valikud"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Tühista kõigi objektide valikud"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Tühista kõik valikud (fookus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Tühista kõik valikud (page)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Värskendab valitud primitiivid serverist"
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Andmete värskendamine"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Uuenda valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Ei ole valitud primitiive mida uuendada."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Tühi valik"
@@ -1680,8 +1655,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1690,5 +1665,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1696,29 +1671,29 @@
 msgstr "Pole muudatusi mida üles laadida."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Midagi pole üles laadida. Hangi esmalt andmeid."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Sünkroniseeri kogu andmekogu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1732,11 +1707,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1747,5 +1722,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1755,23 +1730,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Konfliktne relatsioon"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1782,28 +1756,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Laadimine OSM API-le ebaõnnestus"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Primitiivi uuendamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1812,17 +1777,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Muuda {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1841,11 +1820,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Suumi sisse"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Suumi välja"
@@ -1925,21 +1904,17 @@
 msgstr "Aeglasemalt edasi"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "GPS andmete allalaadimine"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Alla laetud GPX andmed"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Toored GPS andmed"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Andmete allalaadimine"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1947,27 +1922,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Openstreetmapi andmed"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Laen alla {0} {1}-st ({2} veel)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "Mass-allalaadimise käigus tekkisid järgmised vead:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Viga allaladimise ajal"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Andmete värskendamine"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Kasutajanimi"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1979,7 +1965,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Kustutatud või nihutatud primitiivid"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Mass-allalaadimise käigus tekkisid järgmised vead:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Viga allaladimise ajal"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Viga allaladimise ajal"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2001,5 +2002,5 @@
 msgstr "Režiim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2027,38 +2028,38 @@
 msgstr "valitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Lisa sõlm teele ja ühenda"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Loo uus sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Vali kursori all olev sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2067,14 +2068,14 @@
 msgstr[1] "Lisa {0} teele uus sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "Alusta uut teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Jätke teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Lõpeta joonistamine."
@@ -2094,5 +2095,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2104,5 +2105,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Pööramise lõpetamiseks vabasta hiire nupp."
@@ -2162,10 +2163,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2175,4 +2176,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Mastaap"
@@ -2190,5 +2192,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Otsi..."
@@ -2287,42 +2288,48 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2332,51 +2339,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Otsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Alusta otsingut"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Leitud {0} vastet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr ""
@@ -2404,26 +2411,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2432,5 +2450,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2525,4 +2543,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2540,8 +2574,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Muuda {0} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2622,5 +2656,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2656,4 +2690,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parameeter ''{0}'' ei tohi olla null"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2684,29 +2729,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Konfliktne relatsioon"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr ""
@@ -2714,6 +2736,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2722,5 +2744,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2904,15 +2926,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, java-format
+msgid "Illegal double value ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2921,5 +2958,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2928,5 +2965,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2935,5 +2972,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2942,5 +2979,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2948,5 +2985,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2955,5 +2992,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2962,5 +2999,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2969,5 +3006,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2976,19 +3013,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -2997,5 +3057,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "TUNDMATU"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3017,20 +3097,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr ""
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr ""
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr ""
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr ""
@@ -3041,4 +3121,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3106,14 +3200,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3121,5 +3215,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3146,6 +3240,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3205,113 +3299,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
+#, java-format
+msgid "Deleted member ''{0}'' in relation."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
-#, java-format
-msgid "Deleted member ''{0}'' in relation."
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#, java-format
+msgid "Way ''{0}'' with less than two points."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+msgid "More than one \"from\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
-#, java-format
-msgid "Way ''{0}'' with less than two points."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
-msgid "More than one \"from\" way found."
+msgid "More than one \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+msgid "More than one \"via\" found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-msgid "More than one \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
-msgid "More than one \"via\" found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3332,5 +3426,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3346,5 +3440,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3355,5 +3448,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3382,5 +3474,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "taust"
@@ -3448,10 +3540,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3480,5 +3572,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr ""
@@ -3495,4 +3587,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3508,33 +3602,33 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Eelitingimuste rikkumine"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3542,16 +3636,16 @@
 msgstr "Vastuolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Tundmatu host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3564,4 +3658,8 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Laen alla \"päeva sõnumit\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+msgid "Click to close the dialog"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3631,74 +3729,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Kasutajanimi"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Salasõna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3707,9 +3805,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3717,25 +3815,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Aktiveerin uuendatud pistikrakendused"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Pistikrakenduste laadimine"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3748,11 +3846,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3777,6 +3875,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3877,24 +3975,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "kiht ei ole nimekirjas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Viga parsimisel"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -3916,5 +4010,5 @@
 msgstr "määramata: ei sea seda valikut valitud objektidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3943,24 +4037,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Muuda {0} objekt"
-msgstr[1] "Muuda {0} objekti"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Kustuta valitud objektid."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "Kustuta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "seos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -3972,5 +4063,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4019,5 +4110,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4034,5 +4125,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4232,8 +4323,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4540,6 +4631,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4553,6 +4644,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4610,36 +4701,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4651,5 +4742,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "kõik"
@@ -4739,4 +4830,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4747,4 +4840,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4758,49 +4852,82 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Sisesta kõigi vastuolude kohta väärtused."
+
+#: ../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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4837,6 +4964,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4924,10 +5051,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -4994,5 +5118,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5037,4 +5162,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5060,6 +5186,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5068,22 +5194,22 @@
 msgstr[1] "See muudab kuni {0} objekti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Tühi väärtus kustutab võtme."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<erinev>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Muuta väärtusi?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5092,69 +5218,73 @@
 msgstr[1] "Muuda kuni {0} objekti seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Palun vali võti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Palun vali väärtus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Palun vali objektid mille seadeid soovid muuta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Seaded/Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Valitud objektide seaded"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "On liikmeks järgnevas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Lisa seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Seadete muutmine"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Seaded: {0} / Liikmelisus: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Seaded / Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Muuda seost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Tõesti soovid kustutada valikut seosest {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Kustuta valitud võti kõkides objektides"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
@@ -5162,40 +5292,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Seosed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Ava kõikide seoste nimekiri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Seosed: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Ava toimetajas valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Kustuta valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Loo uus seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Kustuta valitud seos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Vali miski:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Kustuta valitud seos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Lae alla liikmed"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5222,5 +5372,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5232,9 +5382,9 @@
 msgstr "Valik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Lase paneel vabaks"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5242,5 +5392,5 @@
 "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu"
@@ -5322,5 +5472,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5350,23 +5501,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5375,14 +5526,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5392,9 +5543,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5404,15 +5555,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5420,5 +5571,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5426,20 +5577,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5448,66 +5599,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Liiguta hetkel valitud liiget ülespoole"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Liiguta hetkel valitud liiget allapoole"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5516,9 +5667,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5527,41 +5678,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Lae alla liikmed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5571,17 +5722,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5592,13 +5743,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5612,14 +5763,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5669,57 +5820,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Järjehoidjad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Palun sisesta enne soovitud kordinaadid."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Alade loomine"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Liiguta hetkel valitud liiget allapoole"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Palun sisesta koha nimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Vali enne järjehoidja."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Liiguta hetkel valitud liiget ülespoole"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Liiguta hetkel valitud liiget ülespoole"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5728,356 +5910,135 @@
 "URL lehelt www.openstreetmap.org (saad kleepida siia allalaetava ala URL''i)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Ümbritsev kast"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Andme allikad ja tüübid"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Openstreetmapi andmed"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Lahuta tee valitud sõlme kohalt."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Toored GPS andmed"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Valitud tee ei sisalda valitud sõlme"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Lae alla uue kihina"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Allalaetav ala"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Lae alla"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Kustuta valitud kiht"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Allalaetav ala liiga suur; server arvatavasti keeldub"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Allalaetav ala paras, suurus serverile tõenäoliselt sobiv"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Liiguta hetkel valitud liiget ülespoole"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "PAlun vali rida muutmiseks"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Sisesta otsitava koha nimi:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Sisesta otsitava koha nimi:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 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:168
-msgid "Please enter a search string"
-msgstr "Palun sisesta otsingutekst"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Ei saa lugeda kohaotsingu tulemusi serverist"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Sisesta otsitava koha nimi:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Asukohad"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "nimi"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "tüüp"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "lähedal"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "suurendus"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "suurendusaste"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x kohast"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "kuni"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y kohast"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Pildi numbrid"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Otsi..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+msgid "Click to start searching for places"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6435,4 +6396,6 @@
 #. 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" />
@@ -6813,6 +6776,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6878,11 +6842,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6892,6 +6856,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6901,79 +6865,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Nimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "lähedal"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "suurendusaste"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x kohast"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "kuni"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y kohast"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Pildi numbrid"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7054,4 +7285,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7343,9 +7575,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Objektid muuta:"
+msgstr[1] "Objektid muuta:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7443,5 +7675,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7471,59 +7712,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7531,51 +7772,51 @@
 msgstr[1] "pildid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Sünkroniseeri kell"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Pilt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7583,30 +7824,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7614,5 +7855,5 @@
 msgstr "Kohanda värvi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7621,5 +7862,5 @@
 msgstr "Vaikimisi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7628,43 +7869,43 @@
 msgstr "Vali värv"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Heli import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Piltide import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7674,28 +7915,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7704,5 +7945,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7711,10 +7952,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Muuda andme kihiks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7724,11 +7965,11 @@
 "kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7738,29 +7979,29 @@
 msgstr "Muudetud sellest: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7769,13 +8010,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7783,5 +8020,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7789,23 +8026,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Andmekiht {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7814,39 +8051,55 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} kustutatud.)"
+msgstr[1] " ({0} kustutatud.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} kustutatud.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8011,6 +8264,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8025,6 +8276,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8194,5 +8443,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8518,20 +8767,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8546,6 +8794,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Uuenda"
@@ -8696,68 +8943,102 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Liiguta valitud sõlmed ringiks."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Muuda kõikide valitud objektide võtme väärtust"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Lisa teele sõlm"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Värskenda valikute nimekirja."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Kustuta valitud seos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8937,5 +9218,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Rohkem teavet sellest funktsioonist"
@@ -9000,16 +9281,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Eelseadete grupp \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Eelseadete grupp \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9017,5 +9298,5 @@
 msgstr "Ühendun OSM serveriga..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9124,5 +9405,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Parse error: vigane gpx dokumendi struktuur"
@@ -9348,5 +9629,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9373,5 +9654,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9379,5 +9660,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9390,5 +9671,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9399,50 +9680,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Vale salasõna või kasutajanimi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Ettevaatust: Salasõna saadetakse krüpteerimata."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Salvesta kasutaja ja salasõna (krüpteerimata)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Sisesta salasõna"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM parool"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9539,5 +9820,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9546,38 +9827,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9585,19 +9866,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Puudulik <member> määratlus ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Keelatud objekti number id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9606,7 +9887,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9616,25 +9901,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9642,5 +9927,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9649,5 +9934,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9655,5 +9940,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9662,13 +9947,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Valmistan ette OSM andmeid..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9679,14 +9964,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Lae OSM serverist..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9797,15 +10081,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Pistikrakenduste uuendamine"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9818,29 +10102,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9852,10 +10140,10 @@
 msgstr "Pistikus {0} tekkis viga"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9865,47 +10153,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Pistikrakenduste uuendamine"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9915,9 +10214,9 @@
 "on piisavalt õigusi olemasolevate pistikrakenduste ülekirjutamiseks."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9925,19 +10224,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9945,22 +10244,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "kirjeldust pole saadaval"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9969,18 +10268,18 @@
 msgstr[1] "Laadisin alla pluginate info {0} saidilt"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Pluginate infot ei leitud"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Kõik installeeritud pluginad on uuendatud."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -9993,9 +10292,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Lae puuduvad pistikrakendused alla"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10010,9 +10309,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10034,19 +10333,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "tundmatu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versioon {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin kaasatud JOSMi"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10106,5 +10405,5 @@
 msgstr "(Tekst on juba kopeeritud clipboardi.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10113,5 +10412,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10120,5 +10419,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10128,5 +10427,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10136,10 +10435,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10148,5 +10447,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10155,16 +10454,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10174,5 +10473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10181,5 +10480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10188,5 +10487,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10195,10 +10494,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10207,10 +10506,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10221,5 +10520,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10229,5 +10528,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10238,5 +10537,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10338,11 +10637,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10485,5 +10777,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -10499,10 +10792,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10510,103 +10803,103 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10656,46 +10949,47 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
+msgstr "Liiguta valitud kiht ühe rea võrra üles."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -10947,5 +11241,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -10958,10 +11252,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11009,13 +11303,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11024,13 +11318,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11155,5 +11449,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11194,13 +11488,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11331,22 +11625,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11354,5 +11648,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11366,9 +11660,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11391,5 +11685,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11411,5 +11705,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr ""
@@ -11438,5 +11732,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11445,18 +11739,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11551,5 +11845,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Andmeid ei laetud."
@@ -11955,7 +12249,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr ""
@@ -12156,32 +12450,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr ""
@@ -12270,24 +12564,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12431,4 +12725,9 @@
 msgstr ""
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Kihid"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12474,30 +12773,30 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
+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:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
+msgid "Confirm Remote Control action"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-msgid "Do you want to allow this?"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-msgid "Confirm Remote Control action"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-msgid "Remote Control has been asked to create a new node."
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12516,7 +12815,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12525,4 +12822,5 @@
 #: ../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 ""
@@ -12544,25 +12842,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12592,92 +12890,85 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Mastaap"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+msgid "Show Tile Info"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "suurendusaste"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
 msgstr ""
 
@@ -12691,5 +12982,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12851,5 +13142,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr ""
@@ -12893,29 +13184,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -12923,33 +13214,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Sisesta kõigi vastuolude kohta väärtused."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Lahenda vastuolud."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13156,8 +13447,4 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr ""
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13202,23 +13489,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
-msgid "Unconnected coastline"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
+msgid "Unconnceted coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "Pööra ja sobita."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13241,18 +13527,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13493,4 +13779,8 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13705,7 +13995,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr ""
@@ -13719,5 +14009,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr ""
@@ -13727,25 +14017,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr ""
@@ -13837,21 +14127,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14084,9 +14379,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
@@ -14532,6 +14827,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr ""
@@ -15093,5 +15388,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15103,5 +15398,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "mets"
@@ -15389,7 +15684,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr ""
@@ -15538,8 +15833,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr ""
@@ -15666,31 +15961,4 @@
 msgstr ""
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr ""
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15811,5 +16079,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr ""
@@ -15844,5 +16112,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr ""
@@ -15877,5 +16145,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr ""
@@ -16265,12 +16533,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operaatorfirma"
@@ -16483,6 +16751,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr ""
@@ -16909,5 +17177,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr ""
@@ -17440,25 +17708,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Avatud"
@@ -17524,24 +17792,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17554,24 +17822,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17584,24 +17852,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17634,6 +17902,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr ""
@@ -17649,5 +17917,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
@@ -17661,5 +17929,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr ""
@@ -17895,5 +18163,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr ""
@@ -18361,5 +18629,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr ""
@@ -18374,5 +18642,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Suusatamine"
@@ -18526,16 +18794,27 @@
 
 #. 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:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Mälestusmärk"
@@ -18543,55 +18822,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Puhkus"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Veepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Mänguväljak"
@@ -18599,35 +18878,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Kalapüük"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Staadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr ""
@@ -18641,6 +18920,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "vali spordiala:"
@@ -19032,30 +19311,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr ""
@@ -19065,227 +19344,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kanuu"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "ameerika_jalgpall"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "suusatamine"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "jalgpall"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "lauatennis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfiväljak"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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 "tüüp"
 
 #. item "Sport/Multi" combo "type"
@@ -19322,203 +19654,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Ujumine"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr ""
@@ -19526,56 +19858,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "mägi"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "murdmaa"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "lumepark"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "kerge"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Lasketiir"
@@ -19583,182 +19915,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Jalgpall"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Vali pesapall"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Vali korvpall"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "Golfiväljak"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Vali kriket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Ragbi"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Vali ragbi"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Vali laua tennis"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Vali tennis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Ehitised"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Ehirus"
@@ -19766,5 +20098,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Avalik hoone"
@@ -19772,10 +20104,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Raekoda"
@@ -19783,10 +20115,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Vali raekoda"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Saatkond"
@@ -19794,10 +20126,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Vali saatkond"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -19806,10 +20138,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Vali kohtumaja"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Vangla"
@@ -19818,10 +20150,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Vali vangla"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Politsei"
@@ -19831,10 +20163,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Vali politsei"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -19843,10 +20175,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Vali tuletõrjedepoo"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postkontor"
@@ -19854,5 +20186,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr ""
@@ -19860,15 +20192,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Vali lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Kool"
@@ -19876,10 +20208,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Vali kool"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Ülikool"
@@ -19887,10 +20219,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Vali ülikool"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Kolledž"
@@ -19898,5 +20230,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Vali kolledž"
@@ -19904,5 +20236,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kino"
@@ -19911,10 +20243,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Vali kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Raamatukogu"
@@ -19923,9 +20255,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Vali raamatukogu"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr ""
@@ -19933,10 +20265,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teater"
@@ -19945,10 +20277,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Vali teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Palvekoht"
@@ -19958,5 +20290,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Vali palvekoht"
@@ -19965,6 +20297,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religioon"
@@ -19973,66 +20305,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "kristlane"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "juudi"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "moslem"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastrism (pärsia)"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -20041,81 +20373,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglikaan"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "katoliku"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangeelne"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "jehoovatunnistajad"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "luterlane"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormoon"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "ortodoksne"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "nelipühalane"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbüterlane"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestantlik"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "kveeker"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "šiia"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Aadressid"
@@ -20124,5 +20456,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Vali aadressi infot"
@@ -20130,5 +20462,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Maja number"
@@ -20136,20 +20468,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Maja nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Riigi kood"
@@ -20158,5 +20490,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -20164,61 +20496,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "paaritu"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "paaris"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Töökojad"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Vali töökojad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Vali torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20226,25 +20558,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Vali veetorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gaasimahuti"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Vali gaasimahuti"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -20252,10 +20584,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Vali majakas"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -20263,10 +20595,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Vali tuuleveski"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Torustik"
@@ -20275,37 +20607,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Vali torustik"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gaas"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr ""
@@ -20315,10 +20647,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Kraana"
@@ -20326,10 +20658,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Vali kraana"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Tuletorn"
@@ -20337,10 +20669,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Vali tuletorn"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -20348,10 +20680,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Vali ülevaatlus punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -20359,5 +20691,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Vali järelvalve kaamera"
@@ -20365,5 +20697,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Elektri generaator"
@@ -20373,35 +20705,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Vali elektri generaator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "tuul"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "hüdro"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fosiil"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "tuuma"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "süsi"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -20410,10 +20742,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Vali elektrijaam"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Elektrialajaam"
@@ -20422,5 +20754,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Vali elektri alajaam"
@@ -20428,10 +20760,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr ""
@@ -20442,23 +20774,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr ""
@@ -20467,75 +20799,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Pinge"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Teenused"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Tualetid"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefon"
@@ -20544,5 +20876,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr ""
@@ -20550,5 +20882,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Mündid"
@@ -20556,5 +20888,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Märkused"
@@ -20562,5 +20894,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20568,5 +20900,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Deebetkaart"
@@ -20574,15 +20906,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Krediitkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -20591,5 +20923,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Muuda jäätmekäitlusjaam"
@@ -20597,35 +20929,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Riided"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr ""
@@ -20634,31 +20966,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20729,39 +21061,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "roheala"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Muuda jahiala"
@@ -20770,30 +21102,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "madal"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "pool"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "täis"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Peida"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Lukusta"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Purskaev"
@@ -20802,10 +21134,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Vali purskaev"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Joogi vesi"
@@ -20814,10 +21146,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Vali joogivee asukoht"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -20825,33 +21157,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Vali Supermarket"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Nurgakauplus"
@@ -20859,9 +21191,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Vali nurgakauplus"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -20869,27 +21201,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Vali kiosk"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr ""
@@ -20897,5 +21229,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr ""
@@ -20903,88 +21235,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "toit"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "joogid"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "maiustused"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "suitsud"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "fotod"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "looma_toit"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "ajalehed"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "mänguasjad"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "templid"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "telefoni_kaardid"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "kondoomid"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampoonid"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Lihunik"
@@ -20992,9 +21324,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Vali lihunik"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Pagar"
@@ -21002,9 +21334,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Vali pagar"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Lilleseadja"
@@ -21012,18 +21344,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Vali lilleseadja"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Ökokaubad"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Redigeeri ökopoodi"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -21031,54 +21363,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Redigeeri alkoholi poode"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Joogipood"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Arvuti"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Vali arvutipood"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Elektroonika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Vali elektroonika pood"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Mööbel"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Vali mööblipood"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Aiakeskus"
@@ -21086,9 +21418,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Vali aiakeskus"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Riistvara"
@@ -21096,9 +21428,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Vali riistvara pood"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -21106,54 +21438,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Kirjatarbed"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Vali kirjatarvete pood"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Juuksur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Vali juuksur"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Jalatsid"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Vali jalatsi pood"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Vali mänguasja pood"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Vali video pood"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Kuiir puhastus"
@@ -21161,9 +21493,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Vali kiirpuhastus"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Pesumaja"
@@ -21171,9 +21503,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Vali pesumaja"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Välisuks"
@@ -21181,28 +21513,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Vali välisukse pood"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Vali spordi pood"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Vali optika"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Sularaha"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Pank"
@@ -21210,14 +21542,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Vali Pank"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Sularaha automaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Raha vahetus"
@@ -21225,5 +21557,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Vali rahavahetus punkt"
@@ -21231,15 +21563,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Vali sularaha automaat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Tervis"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Arstid"
@@ -21247,18 +21579,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Vali arstid"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Vali hambaarst"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -21266,5 +21598,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Vali Apteek"
@@ -21272,9 +21604,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Retseptuur"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Haigla"
@@ -21282,10 +21614,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Vali haigla"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -21294,5 +21626,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Vali hädaabi tugijaam"
@@ -21301,20 +21633,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Telefoninumber"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -21322,5 +21654,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -21329,59 +21661,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Vali loomaarst"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Asukohad"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Vali kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Vali maa"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Riik"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Vali riik"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Regioon"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Vali regioon"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Maakond"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Vali maakond"
@@ -21389,15 +21726,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Linn"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Vali linn"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Linn"
@@ -21405,10 +21742,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Muuda linna"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -21416,25 +21753,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Muuda linnaosa"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Küla/Alevik/Alev"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Muuda küla/alevik/alev"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Küla"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Muuda küla"
@@ -21442,5 +21779,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -21448,10 +21785,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Muuda asustamata kohta"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Saar"
@@ -21459,10 +21796,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Muuda saart"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21470,5 +21807,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21476,5 +21813,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -21482,10 +21819,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Muuda koobast"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Mäetipp"
@@ -21493,10 +21830,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Muuda mäetippu"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Liustik"
@@ -21504,10 +21841,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Muuda liustikku"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -21515,70 +21852,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Muuda vulkaani"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Riiklikud"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Muuda riiklikke piire"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Muuda administratiivpiire"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Muuda omavalitsuse piire"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Muuda valimisringkonda"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Muuda rahvuspargi piire"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Üksik puu"
@@ -21587,15 +21924,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Muuda puud"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Mets"
@@ -21604,5 +21941,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Muuda metsa"
@@ -21610,17 +21947,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "okasmets"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "lehtmets"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "segamets"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -21629,14 +21966,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Muuda kultuurmetsa"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Muuda looduskaitseala"
@@ -21644,25 +21981,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "klibu, rusukalle"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Muuda rusukallet"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Muuda võsa"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Langus"
@@ -21670,10 +22007,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Muuda langust"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Nõmm"
@@ -21681,5 +22018,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Muuda nõmme"
@@ -21687,5 +22024,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -21694,45 +22031,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Muuda taluõue"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Muuda talumaad"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Niit/Karjamaa"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Muuta niitu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Muuda viinapuuistandust"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Eraldised"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Muuda eraldisi"
@@ -21740,25 +22077,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Aed"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Muuda aeda"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Muru"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Muuda muru"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Külatanum"
@@ -21766,10 +22103,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Muuda külatanumat"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Avalik maa"
@@ -21777,20 +22114,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Muuda avalikku maad"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Muuda parki"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -21798,5 +22135,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Muuda puhkeala"
@@ -21804,15 +22141,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Muuda elamurajooni"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -21820,9 +22157,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Muuda matmispaika"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -21830,39 +22167,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Muuda kalmistut"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Muuda kaubandust"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Muuda kommertspiirkonda"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Muuda tööstuspiirkonda"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Raudtee"
@@ -21870,15 +22207,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Muuda raudteed"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Militaarala"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Muuda militaarala"
@@ -21886,55 +22223,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Muuda ehitustandrit"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Muuda jäätmaad"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Muuda roheala"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Muuda prügimäge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Muuda kivimurdu"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -21944,5 +22281,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Muuda hulknurka"
@@ -21951,10 +22288,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "väline osa"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "siseosa"
@@ -21962,5 +22299,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -21969,5 +22306,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Muuda pöördekeelde"
@@ -21975,34 +22312,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -22011,15 +22348,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "teelt"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "üle sõlme või tee"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "teele"
@@ -22027,5 +22364,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Teekond"
@@ -22034,5 +22371,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Muuda teekonda"
@@ -22040,5 +22377,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "teekonna tüüp"
@@ -22110,5 +22447,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22117,17 +22454,17 @@
 msgstr "jalgrattaga"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "tee"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "praam"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "suusad"
@@ -22180,5 +22517,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22187,13 +22524,13 @@
 msgstr "jalgsi"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "matkamine"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "tramm"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "ümbersõit"
@@ -22207,10 +22544,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "metroo"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -22218,31 +22555,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Võrk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "planeeritud"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "täiendav"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "ajutine"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "ühendus"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -22251,30 +22588,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "edasisuunaline peatuspunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "tagasisuunaline peatuspunkt"
@@ -22712,11 +23049,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "kasutusest väljas"
@@ -24740,5 +25077,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "vesi"
@@ -25410,4 +25747,12 @@
 #.
 #. <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"/>
@@ -25432,5 +25777,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "alalooline"
@@ -25444,5 +25789,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "kivimurd"
@@ -25456,5 +25801,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "prügimägi"
@@ -25476,5 +25821,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "tehisjärv"
@@ -25488,5 +25833,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "kultuurmets"
@@ -25500,5 +25845,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "taluõu"
@@ -25521,5 +25866,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "kaubandus"
@@ -25533,5 +25878,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "tööstus"
@@ -25545,5 +25890,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -25557,5 +25902,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -25569,5 +25914,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -25624,7 +25969,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "militaarala"
@@ -25638,5 +25983,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "kalmistu"
@@ -25649,5 +25994,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "mäetipp"
@@ -25662,5 +26007,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "liustik"
@@ -25674,5 +26019,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "vulkaan"
@@ -25727,8 +26072,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "looduslik"
@@ -25742,5 +26087,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "põõsastik"
@@ -25754,5 +26099,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "nõmm"
@@ -25766,8 +26111,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "mets"
+msgstr ""
 
 #. color water
@@ -25779,5 +26123,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "muda"
@@ -25791,5 +26135,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "rand"
@@ -25867,8 +26211,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "teekond"
@@ -25916,7 +26260,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "piir"
@@ -26066,11 +26410,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "koht"
@@ -26118,6 +26462,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "aadress"
@@ -26428,15 +26772,36 @@
 #~ msgstr "Lae OSMi serverisse"
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Viga lehekülje {0} laadimisel."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada."
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Kasuta eelseadet \"{0}\""
+#~ msgid "File could not be found."
+#~ msgstr "Faili ei leitud"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Palun vali allalaadimiseks vähemalt üks toiming."
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Laadimine OSM API-le ebaõnnestus"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Konfliktne relatsioon"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Viga parsimisel"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Palun sisesta enne soovitud kordinaadid."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Vali enne järjehoidja."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Palun sisesta otsingutekst"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Ei saa lugeda kohaotsingu tulemusi serverist"
+
+#~ msgid "name"
+#~ msgstr "nimi"
+
+#~ msgid "zoom"
+#~ msgstr "suurendus"
 
 #~ msgid "Move"
@@ -26492,10 +26857,13 @@
 #~ msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest."
 
-#~ msgid "Aborting..."
-#~ msgstr "Katkestan..."
-
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr ""
 #~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Kasuta eelseadet \"{0}\""
 
 #~ msgid "Tags (empty value deletes tag)"
@@ -26542,7 +26910,4 @@
 #~ msgstr "Autorid: {0}"
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "Värskenda valikute nimekirja."
-
 #~ msgid "Merging conflicts."
 #~ msgstr "Ühendan vastuolusid."
@@ -26576,4 +26941,10 @@
 #~ msgstr "Kõik teed olid tühjad."
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada."
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Viga lehekülje {0} laadimisel."
+
 #~ msgid "Open in Browser"
 #~ msgstr "Ava sirvikus"
@@ -26694,7 +27065,4 @@
 #~ msgstr "<nd> element võib olla vaid way-s."
 
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Värskendab valitud primitiivid serverist"
-
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Abileht puudub. Loo see <A HREF=\"{0}\">English</A>."
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 18273)
+++ applications/editors/josm/i18n/po/fi.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-02 21:52+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-03 07:42+0000\n"
+"Last-Translator: Jyri-Petteri Paloposki <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:05+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Luodaan pääikkuna"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Ohje"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Varoitus"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Ei voitu lukea tiedostoa ''{0}''.<br> Virhe: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Virhe"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "TUNTEMATON"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Tietoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Näytä tietoja-ruutu."
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap -editori"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Versio {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Edellinen muutos {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Javan versio {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Virheilmoitukset"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,34 +248,30 @@
 msgstr "Tietoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Lueminut"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Versio"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Lisenssi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Tietoja JOSM:sta..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Tiedostoa ei löytynyt."
-
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
 #, java-format
@@ -311,49 +294,50 @@
 "screen with browser windows<br>and take some time to finish."
 msgstr ""
+"Olet avaamassa {0} selainikkunaa.<br>Tämä saattaa täyttää näytön "
+"ikkunoilla<br>ja viedä jonkin verran aikaa."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
 msgid "Continue"
-msgstr ""
+msgstr "Jatka"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -361,5 +345,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -372,19 +356,19 @@
 msgstr "Valitse ainakin yksi jo lähetetty piste, polku tai relaatio."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Ole hyvä ja valitse kohdetaso"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Valitse kohdetaso"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -392,51 +376,53 @@
 "</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+"<html>Valittua tasoa <br>{0}<br>ei voi yhdistää mihinkään nykyisistä "
+"tasoista.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Ei kohdetasoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Lisää piste..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Lisää piste syöttämällä leveyspiiri ja pituuspiiri."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Muokkaa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Syötä uuden pisteen koordinaatit."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Anna asteet desimaalilukuna."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negatiiviset arvot tarkoittavat läntistä/eteläistä pallonpuoliskoa."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -445,5 +431,5 @@
 msgstr "Leveysaste"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -452,27 +438,27 @@
 msgstr "Pituusaste"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Siirrä pisteet ympyrän kehälle"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Siirtää valitut pisteet ympyrän kehälle."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -482,5 +468,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -496,30 +482,28 @@
 msgstr "Työkalu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Valitse ainakin neljä pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -529,84 +513,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Kohdista pisteet samalle viivalle"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Siirtää valitut pisteet samalle viivalle."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Valitse ainakin kolme pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "taso"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "ristiriita"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "lataa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Sovita näkymä {0}:aan."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Sovita {0} näkymään."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Näytä: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Ei mitään valittuna"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Ei ristiriitoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Sulje avoimet muutoskokoelmat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Sulkee avoimet muutoskokoelmat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -614,37 +598,37 @@
 msgstr "Tiedosto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Ei avonaisia muutoskokoelmia"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Ei avonaisia muutoskokoelmia"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Ladataan avonaiset muutoskokoelmat..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Yhdistä polkuja"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Yhdistää monta polkua yhdeksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Vaihdetaanko suuntia?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Käännä ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -653,5 +637,5 @@
 "Polkuja ei voi yhdistää nykyisessä suunnassa. Haluatko kääntää osan niistä?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -660,41 +644,41 @@
 "Polkuja ei voitu yhdistää. (Niitä ei voitu yhdistää yhdeksi pistejonoksi)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Yhdistä {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Valitse ainakin kaksi yhdistettävää polkua."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopioi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopioi valitut objektit leikepöydälle."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Valitse jotain kopioitavaksi."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Luo ympyrä"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Luo ympyrän kolmesta valitusta pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Valituista pisteistä ei voi muodostaa ympyrää."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -703,16 +687,14 @@
 "Valitse joko tasan kolme pistettä, tai polku jossa on tasan kolme pistettä"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -724,5 +706,5 @@
 msgstr "Poista"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Poista valitut objektit."
@@ -730,6 +712,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -743,114 +725,91 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Kohdista pisteet tasavälein viivalle"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Jakaa valitut pisteet tasaisin välein viivalle."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Lataa OSM:sta..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Lataa karttadataa OSM-palvelimelta."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Lataa"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Valitse vähintään yksi ladattava tietolaji."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+msgstr "Lataa polut/relaatiot joihin tämä kuuluu..."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Lataa kaikki valittuihin objekteihin viittaavat objektit."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr "ld > 0 vaadittu, saatiin {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
 #, java-format
 msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+msgstr "Parametr ''{0}'' ei saa olla \"null\""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Tuonnin aikana oli {0} konfliktia."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Konflikti latauksen aikana"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Ladataan objektiin {2} viittaavia objekteja"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Ladataan objektiin {2} viittaavia objekteja"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Ladataan objektiin {2} viittaavia objekteja"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Monista"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../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."
@@ -860,41 +819,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Poistu"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Poistu ohjelmasta."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+msgstr "Kaikki tunnetut muodot"
+
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "GPX-vienti..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Vie data GPX-tiedostoon."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Ei mitään vietävää. Hae ensin dataa."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -933,6 +892,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -951,9 +910,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -973,5 +932,5 @@
 msgstr "parametri ''{0}'' ei saa olla tyhjä"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -979,36 +938,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Vie GPX-tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+msgstr "Objektin 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."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../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ä"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Näytä tietoja OSM-pisteistä, -poluista tai -relaatioista."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Yhdistä piste polkuun."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Yhdistää pisteen lähimpään polun segmenttiin."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Yhdistä piste ja polku."
@@ -1018,168 +977,186 @@
 msgstr "Ei pikanäppäintä"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Liitä taso"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Liitä nykyinen taso toiseen tasoon"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Yhdistä pisteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Yhdistää pisteet vanhimpaan."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Valitse vähintään kaksi yhdistettävää pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Keskeytetään..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Yhdistä {0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Liitä valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../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:33
+msgstr "Yhdistä nyt valitut uuteen tasoon"
+
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Peilaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Peilaa valitut pisteet ja polut"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Valitse ainakin yksi solmu tai tie"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "ylös"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Siirrä objektit {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "alas"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "vasen"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "oikea"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Siirrä {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Siirtää objektit {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Objekteja ei voi siirtää maailman ulkopuolelle"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Uusi"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Luo uusi kartta."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Avaa..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Avaa tiedosto"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Avataan tiedostoja"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Avataan tiedostoa \"{0}\"..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Avaa sijainti..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Avaa URL-osoite."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Erota taso"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+msgstr "Valitse jos tiedot pitäisi ladata uudelle tasolle"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Anna ladattavan alueen URL-osoite:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+msgstr "Syötä URL jonka tiedot pitäisi ladata"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Latauksen sijainti"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Lataa URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+msgstr "Aloita lataus"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
-msgstr ""
+msgstr "Sulje ikkuna ja peruuta lataus"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Ladataan dataa"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Suorakulmaista muoto"
@@ -1189,18 +1166,18 @@
 msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1209,9 +1186,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1219,37 +1196,41 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+"<html>Olet käyttämässä EPSG:4326-projektiota, joka saattaa "
+"johtaa<br>epätoivottuun tulokseen suorakulmaisessa asettelussa.<br>Muuta "
+"projektiota päästäksesi eroon tästä varoituksesta.<br>Haluatko jatkaa?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+msgstr "Käyttö"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Suorakulmaista"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Liitä"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Liitä leikepöydän sisältö"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Liitä tagit"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../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ä."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1258,5 +1239,5 @@
 msgstr[1] "Liitetään {0} tagia"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1265,59 +1246,59 @@
 msgstr[1] "{0} objektiin"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Asetukset..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Muokkaa JOSM:n asetuksia."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Toista"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Toista edellinen kumottu toiminto"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Nimeä taso uudelleen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Nimeä myös tiedosto uudelleen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Ei voitu nimetä uudelleen tiedostoa ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Käännä polut"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Kääntää valittujen polkujen suunnan."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Valitse ainakin yksi polku."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Käännä polut"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1325,10 +1306,10 @@
 msgstr "Tallenna"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Tallenna tämänhetkinen data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1337,5 +1318,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 msgid "No Exporter found! Nothing saved."
-msgstr ""
+msgstr "Vientiosa puuttuu! Ei tallennettu."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
@@ -1379,21 +1360,21 @@
 msgstr "Tallenna kerros"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Tallenna nimellä..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Tallenna data uuteen tiedostoon."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1403,28 +1384,28 @@
 "objektit."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Näytä raportti"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+msgstr "Näytä tilaraportti virheraportteihin liittäessä hyödyllisin tiedoin."
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+msgstr "Ohje: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Raportti"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Kopioi leikepöydälle ja sulje"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1433,18 +1414,18 @@
 msgstr "Sulje"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Katkaise polku"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Katkaisee polun valitun pisteen kohdalta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Valintaa ei voida käyttää jakamiseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1452,5 +1433,5 @@
 msgstr[1] "Valitut pisteet eivät ole keskellä mitään polkua."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1466,9 +1447,9 @@
 "valitse myös polku jonka haluat katkaista."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Valitut pisteet eivät ole samalla polulla."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1476,10 +1457,10 @@
 msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Vähintään kaksi pistettä tulee valita ympyräpolun katkaisemiseksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1508,61 +1489,61 @@
 msgstr "Katkaise polku {0} {1} osaksi"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Näytä/piilota GPX-viivat"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Piirrä viivat GPS-pisteiden välille."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Vaihda asetuksen \"{0}\" tila"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Erota polut"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Monistaa pisteet, jotka ovat monen polun käytössä."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Tämä piste ei ole yhdistettynä mihinkään muuhun."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Mikään valituista pisteistä ei ole useammassa kuin yhdessä polussa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Mikään valitun polun pisteistä ei ole osana muita polkuja."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Tämän hetkistä valintaa ei voi käyttää polkujen erotukseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Valitse joko:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Yksi piste jolla on tageja, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Yksi piste, joka on useamman polun käytössä, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Yksi piste, joka on useamman polun käytössä ja yksi noista poluista, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1571,5 +1552,5 @@
 "polkujen käytössä, tai"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1578,5 +1559,5 @@
 "käytössä."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1589,9 +1570,9 @@
 "kaikki polut saavat oman kopionsa ja kaikki pisteet tulevat valituiksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Irroitettu piste"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1599,93 +1580,96 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Monista {0} pistettä {1} pisteeksi"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Kumoa"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Peru viimeisin toiminto."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Poista valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Poista valinta kaikista objekteista."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+msgstr "Poista valinnat  (fokus)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+msgstr "Poista valinnat (escape)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+msgstr "Päivitä tietoa"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Päivittää nykyisen tietotason objektit palvelimelta."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+msgstr "Päivitä valinnat"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+msgstr "Päivittää valitut objektit palvelimelta (uudelleenlataa tiedot)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Päivitä valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Päivitettäviä objekteja ei valittuna."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
-msgstr ""
+msgstr "Valinta tyhjä"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 msgid "Upload data"
-msgstr ""
+msgstr "Lähetä tietoa"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+"Lähetä kaikki nykyisessä tietotasossa olevat muutokset OSM-palvelimelle"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1693,6 +1677,8 @@
 "resolve them first.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+"<html>Kerroksessa \"{0}\" on ratkaisemattomia konflikteja.<br>Ratkaise ne "
+"ensin.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1700,29 +1686,29 @@
 msgstr "Ei lähetettäviä muutoksia."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Ei mitään lähetettävää. Hae ensin dataa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+msgstr "Synkronoi koko tiedosto"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1736,11 +1722,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1751,5 +1737,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1759,23 +1745,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Muutoskokoelma suljettu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Ristiriidassa oleva relaatio"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1786,28 +1771,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1816,19 +1792,33 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Lähetetään dataa..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+msgstr "Lähetä valinta"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
-msgstr ""
+msgstr "Lähetä kaikki valittujen objektion muutokset OSM-palvelimelle"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:259
@@ -1845,11 +1835,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Lähennä"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Loitonna"
@@ -1929,21 +1919,17 @@
 msgstr "Hitaammin eteenpäin"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Ladataan GPS-dataa"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Ladattu GPX-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Raaka GPS-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Ladataan dataa"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1951,27 +1937,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreeMap-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Tiedon päivitys"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Käyttäjän nimi."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ohita"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Peruuta lähetys ja jatka muokkausta"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1983,7 +1981,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Konflikti latauksen aikana"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2005,5 +2018,5 @@
 msgstr "Tila: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2034,38 +2047,38 @@
 msgstr "valitut"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Lisää piste polkuun ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Luo uusi piste."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Valitse kursorin alla oleva piste."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2074,14 +2087,14 @@
 msgstr[1] "Lisää uusi piste {0} polkuun."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "Aloita uusi polku viimeisestä pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Jatka polkua viimeisestä pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Lopeta piirtäminen."
@@ -2101,5 +2114,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
@@ -2111,5 +2124,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi."
@@ -2169,10 +2182,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2182,4 +2195,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zoomaus"
@@ -2199,5 +2213,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Etsi..."
@@ -2296,42 +2309,48 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2341,51 +2360,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Etsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Hakusanalla \"{0}\" ei löytynyt mitään"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Valintaan ei lisätty mitään haulla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Valinnasta ei poistettu mitään haulla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Löytyi {0} osumaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr ""
@@ -2416,26 +2435,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Loogiselta operaattorilta \"tai\" (or) puuttuu parametri."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Loogiselta operaattorilta \"ei\" (not) puuttuu parametri."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Päättävä sulkumerkki puuttuu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2444,5 +2474,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2539,4 +2569,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2554,8 +2600,8 @@
 msgstr "Lisää relaatio {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Poista {0} objekti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2636,5 +2682,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2670,4 +2716,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "Parametr ''{0}'' ei saa olla \"null\""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2698,29 +2755,6 @@
 msgstr[1] "Poista {0} relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Ristiriidassa oleva relaatio"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Poista relaatiosta"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Katkaise polku"
@@ -2728,6 +2762,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2739,5 +2773,5 @@
 "<br>Oletko varma, että haluat poistaa ne?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2923,15 +2957,30 @@
 msgstr "Automaattinen tagien korjaus"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Oletusarvo on \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Konfiguraatiotiedostossa virhe riv(e)illä {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2940,5 +2989,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2947,5 +2996,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2954,5 +3003,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2961,5 +3010,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2967,5 +3016,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2974,5 +3023,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2981,5 +3030,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2988,5 +3037,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2995,19 +3044,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Asetukset tallennettu kohteeseen {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Asetuksia ei voitu lähettää. Syy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Asetuksia ei voitu ladata palvelimelta."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3016,5 +3088,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "TUNTEMATON"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3036,20 +3128,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "E"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "P"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "L"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "I"
@@ -3061,4 +3153,18 @@
 msgid "Changeset {0}"
 msgstr "Muutoskokoelma {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3125,14 +3231,14 @@
 msgstr "Varoitus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3140,5 +3246,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3165,6 +3271,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3224,114 +3330,114 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Poistettu jäsen \"{0}\" relaatiossa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Löytyi enemmän kuin yksi \"from\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Löytyi enemmän kuin yksi \"to\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Useita \"via\" -jäseniä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Tuntematon rooli \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Ei \"from\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Ei \"to\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kiellolle {0} ei löydy piirtotyyliä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3347,11 +3453,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "teksti"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3367,5 +3472,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3376,5 +3480,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3403,5 +3506,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "tausta"
@@ -3469,10 +3572,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3501,5 +3604,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "rata"
@@ -3516,4 +3619,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3529,33 +3634,33 @@
 msgstr[1] "{0} jäsentä"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3563,16 +3668,16 @@
 msgstr "Ristiriita"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Tuntematon palvelin"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3585,4 +3690,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Ladataan \"Päivän viestiä\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Peruuta muutokset ja sulje tämä ikkuna"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3646,74 +3756,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Käyttäjänimi"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "käyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "valinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Näytä tämä ohje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Palauta oletusasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Aseta kieli."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3722,9 +3832,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "esimerkkejä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3732,25 +3842,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Aktivoidaan päivitetyt liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Ladataan aikaisia liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Asetetaan oletuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Ladataan liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3763,11 +3873,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3792,6 +3902,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3892,25 +4002,21 @@
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "taso ei ole listassa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Virhe jäsennettäessä"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Tiedostoa ei löytynyt"
+#: ../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
@@ -3931,5 +4037,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3958,24 +4064,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Poista {0} objekti"
-msgstr[1] "Poista {0} objektia"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Poista {0} objekti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "poistettu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relaatio"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -3987,5 +4090,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4034,5 +4137,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4049,5 +4152,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4247,8 +4350,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4555,6 +4658,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4568,6 +4671,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4625,36 +4728,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4666,5 +4769,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "kaikki"
@@ -4754,4 +4857,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4762,4 +4867,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4773,49 +4879,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Syötä arvot kaikille ristiriidoille."
+
+#: ../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 ""
+
+#: ../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:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Lähetys <strong>epäonnistui</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4853,6 +4993,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4939,10 +5079,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5009,5 +5146,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5052,4 +5190,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5075,6 +5214,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5083,22 +5222,22 @@
 msgstr[1] "Olet muuttamassa {0} kohdetta."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Tyhjä arvo poistaa avaimen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<eri>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Muutetaanko arvot?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5107,69 +5246,73 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Valitse avain"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Valitse arvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Valitse objektit, joiden ominaisuuksia haluat muokata."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Ominaisuudet/jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Valittujen objektien ominaisuudet."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Muokkaa ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Poista relaatiosta"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Poista asetukset"
@@ -5177,40 +5320,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relaatiot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Avaa lista kaikista relaatioista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaatiot: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Avaa valittu relaatio muokkaimeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Poista valittu relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Luo uusi relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Poista valittu relaatio"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Valitse joko:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Poista valittu relaatio"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Lataa jäsenet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5237,5 +5400,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5247,9 +5410,9 @@
 msgstr "Valinta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Irroita paneeli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5258,5 +5421,5 @@
 "työkalupalkin napista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön"
@@ -5338,5 +5501,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5366,23 +5530,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5391,14 +5555,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5408,9 +5572,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5420,15 +5584,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5436,5 +5600,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5442,20 +5606,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5464,66 +5628,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Siirrä valittuja jäseniä ylöspäin"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Siirrä valittuja jäseniä alaspäin"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5532,9 +5696,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5543,41 +5707,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "Tee muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Tee muutokset ja sulje tämä ikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Peruuta muutokset ja sulje tämä ikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Lataa jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5587,17 +5751,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5608,13 +5772,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5628,14 +5792,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5685,58 +5849,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Yhdistetty"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Ole hyvä ja lisää halutut koordinaatit ensin."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Luo alueita"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Sulje valittuna oleva avoin muutoskokoelma"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Ole hyvä ja anna nimi sijainnille."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Valitse ensin kirjanmerkki."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Siirrä valittuja jäseniä ylöspäin"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Siirrä valittuja jäseniä ylöspäin"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
+msgid "max lat"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
+msgid "max lon"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
-msgid "max lat"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
-msgid "max lon"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5746,357 +5940,138 @@
 "tähän ladataksesi alueen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Rajoittava alue"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Datalähteet ja -tyypit"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreeMap-data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Katkaisee polun valitun pisteen kohdalta."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Raaka GPS-data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Valittu polku ei sisällä valittua pistettä."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Lataa uutena tasona"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Lataa alue"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Lataa"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "GPX-jälkeä ei valittuna"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Ladattava alue on liian iso, palvelin todennäköisesti hylkää pyynnön"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
 "Ladattava alue on sopivan kokoinen, palvelin todennäköisesti hyväksyy pyynnön"
 
-#. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Anna haettava merkkijono"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Sulje ikkuna ja peruuta lataus"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Sulje valittuna oleva avoin muutoskokoelma"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Ole hyvä ja valitse muokattava rivi."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
 msgid "Enter a place name to search for:"
 msgstr "Syötä haettavan paikan nimi:"
 
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Paikat"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "nimi"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "tyyppi"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "lähellä"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "zoom-taso"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "-"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Karttaruutujen numerot"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Syötä haettavan paikan nimi:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Etsi..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Suunta, josta etsitään maata"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6454,4 +6429,6 @@
 #. 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" />
@@ -6832,6 +6809,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6897,11 +6875,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6911,6 +6889,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6920,79 +6898,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Nimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Tyyppi"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "lähellä"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "zoom-taso"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "-"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Karttaruutujen numerot"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7073,4 +7318,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7325,5 +7571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:203
 msgid "Upload"
-msgstr ""
+msgstr "Lähetä"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:152
@@ -7366,9 +7612,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Muokattavat objektit:"
+msgstr[1] "Muokattavat objektit:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7385,5 +7631,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:474
 msgid "Upload the changed primitives"
-msgstr ""
+msgstr "Lähetä muutokset"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:480
@@ -7393,9 +7639,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
 msgid "Illegal upload comment"
-msgstr ""
+msgstr "Virheellinen kommentti"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:507
 msgid "Cancel the upload and resume editing"
-msgstr ""
+msgstr "Peruuta lähetys ja jatka muokkausta"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:614
@@ -7415,5 +7661,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:627
 msgid "Enter an upload comment (min. 3 characters)"
-msgstr ""
+msgstr "Anna muutoskokoelmalle kommentti (vähintään 3 merkkiä)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:685
@@ -7466,7 +7712,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
-msgstr ""
+msgstr "Lähetettävät objektit..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63
@@ -7484,69 +7739,69 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
 msgid "Select objects to upload"
-msgstr ""
+msgstr "Valitse lähetettävät objektit"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
 msgid "Cancel uploading"
-msgstr ""
+msgstr "Peruuta lähetys"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
 msgid "Continue uploading"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+msgstr "Jatka lähetystä"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Lue GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Ei aikaleimaa pisteelle {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Luetaan {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Ei löytynyt aikaleimallisia kuvia."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Luetaan {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Geo-merkityt kuvat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "aikavyöhyke-ero: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7554,51 +7809,51 @@
 msgstr[1] "kuvat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Tahdista kello"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-kuvat (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Kuva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Tahdista aika GPS-yksikön kanssa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Syötettyä aikaa ei voitu tulkita oikein."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7606,30 +7861,30 @@
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Muokkaa viivanpiirtotyyliä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Käytä globaaleja asetuksia."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Viivanpiirtoasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7637,5 +7892,5 @@
 msgstr "Muokkaa väriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7644,5 +7899,5 @@
 msgstr "Oletusarvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7651,43 +7906,43 @@
 msgstr "Valitse väri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Tuo äänitiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Ääniaaltotiedostot (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Tuo kuvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Nimi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7697,28 +7952,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Pituus: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7727,5 +7982,5 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7734,10 +7989,10 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7747,11 +8002,11 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7761,29 +8016,29 @@
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7792,13 +8047,9 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Tasolla ei ole yhtään GPX-jälkeä, johon liittää äänitiedosto."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7806,5 +8057,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7812,23 +8063,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datataso {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "ladatun alueen ulkopuolella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7837,39 +8088,56 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Sulje ikkuna ja peruuta lataus"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} poistettu)"
+msgstr[1] " ({0} poistettu)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} koostuu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} poistettu)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -7881,4 +8149,6 @@
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
@@ -8032,6 +8302,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8046,6 +8314,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8153,9 +8419,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
 msgid "The amount by which the speed is multiplied for fast forwarding"
-msgstr ""
+msgstr "Eteenpäinkelauksen nopeuskerroin"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
 msgid "Fast forward multiplier"
-msgstr ""
+msgstr "Pikakelauksen nopeuskerroin"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
@@ -8217,5 +8483,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8549,20 +8815,19 @@
 msgstr "Kieli"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Käytä sisäänrakennettuja oletusarvoja"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8577,6 +8842,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Päivitä"
@@ -8729,68 +8993,102 @@
 msgstr "Pikanäppäin"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
 msgstr "Poista valittu lähde listasta."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Lisää kommentti"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Suljet valitut avonaiset muutoskokoelmat"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Poista valittu relaatio"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8982,5 +9280,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Lisää tietoja tästä ominaisuudesta"
@@ -9045,16 +9343,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Esivalintaryhmä ”{0}”"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Esivalintaryhmä ”{0}”"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9062,5 +9360,5 @@
 msgstr "Yhdistetään OSM-palvelimeen..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9171,5 +9469,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
@@ -9395,5 +9693,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9420,5 +9718,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9426,5 +9724,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9437,5 +9735,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9446,50 +9744,50 @@
 msgstr "Muutoskokoelmalistaa käsitellään..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Virheellinen salasana tai käyttäjänimi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Varoitus: salasana lähetetään salaamattomana."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Karttatietokantapalvelun URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM-salasana"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9586,5 +9884,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9593,38 +9891,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9632,19 +9930,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Virheellinen objekti (id=0)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9653,7 +9951,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9663,25 +9965,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9689,5 +9991,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9696,5 +9998,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9702,5 +10004,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9709,13 +10011,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Valmistellaan OSM-karttatietoja..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9726,14 +10028,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Lataa OSM:sta..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9811,15 +10112,15 @@
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään pistettä ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään polkua ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:83
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} jäljellä. Lähetetään relaatiota ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:115
@@ -9829,5 +10130,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:141
 msgid "Uploading data ..."
-msgstr ""
+msgstr "Lähetetään dataa..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:148
@@ -9844,15 +10145,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Päivitä liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Lataa liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9865,29 +10166,37 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] ""
+"{0} liitännäinen päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM "
+"uudelleen."
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+"{0} liitännäistä päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM "
+"uudelleen."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9899,10 +10208,10 @@
 msgstr "Tapahtui virhe liitännäisessä {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9912,10 +10221,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Viimeisin liitännäisten päivitys oli yli {0} päivää sitten."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Päivitä liitännäiset"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
@@ -9923,39 +10254,26 @@
 "{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Liitännäistä ei löytynyt: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Viimeisin liitännäisten päivitys oli yli {0} päivää sitten."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
-"<br>asettamalla ”plginmanager.warntime”-asetuksen)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Liitännäistä {0} ei voitu ladata. Poistetaanko se asetuksista?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Poista liitännäinen käytöstä"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9965,9 +10283,9 @@
 "on oikeus korvata vanhat tiedostot."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9975,10 +10293,10 @@
 msgstr "Tapahtui odottamaton poikkeus, joka ilmeni ehkä liitännäisessä ”{0}”."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Liitännäisen sisältämien tietojen mukaan tekijä on {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9986,9 +10304,9 @@
 "Koita päivittää liitännäinen uusimpaan versioon ennen virheilmoituksen tekoa."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Pitäisikö liitännäinen poistaa käytöstä?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9998,22 +10316,22 @@
 "liitännäisen käytöstä."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "kuvausta ei ole saatavilla"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10022,18 +10340,18 @@
 msgstr[1] "Ladattiin liitännäistiedot {0} sivustolta"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Liitännäistietoja ei löytynyt."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Liitännäinen {0} ei ole saatavilla."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Kaikki asennetut liitännäiset ovat ajantasalla."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10046,9 +10364,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Lataa puuttuvat liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10063,9 +10381,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10087,19 +10405,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versio {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Liitännäinen tulee JOSM:n mukana"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10112,5 +10430,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343
 msgid "Error playing sound"
-msgstr "Virhe äänentoistossa"
+msgstr "Virhe soitettaessa ääntä"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53
@@ -10165,5 +10483,5 @@
 msgstr "(Teksti on jo kopioitu leikepöydälle)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10172,5 +10490,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10182,5 +10500,5 @@
 "umpeuduttua</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10190,5 +10508,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10198,10 +10516,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10210,5 +10528,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10217,16 +10535,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10236,5 +10554,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10243,5 +10561,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10250,5 +10568,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10257,10 +10575,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10269,10 +10587,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10283,5 +10601,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10291,5 +10609,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10300,5 +10618,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10400,11 +10718,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10547,5 +10858,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -10561,10 +10873,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10572,103 +10884,103 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10722,46 +11034,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Tutkii hakemistoa"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
+msgstr "Siirrä valittu taso rivi ylöspäin."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Luetaan kuvia..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tutkii hakemistoa {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Sijoittele GPX-tiedoston mukaisesti"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11018,5 +11331,5 @@
 msgstr "Virhe tiedostossa {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11029,10 +11342,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11080,13 +11393,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11095,13 +11408,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11209,7 +11522,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Näytä koordinaatit"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11227,5 +11539,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11266,13 +11578,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11403,22 +11715,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11426,5 +11738,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11438,9 +11750,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11460,9 +11772,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "Siirrä WMS-tasoa (kuvaa) suhteessa muihin tasoihin"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11484,5 +11795,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Tyhjä taso"
@@ -11511,5 +11822,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11518,18 +11829,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11624,5 +11935,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Ei dataa ladattuna."
@@ -12028,7 +12339,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "vesi"
@@ -12239,32 +12550,32 @@
 msgstr "LiveGPS-taso"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Kytkeydy gpsd-palvelimeen ja näytä nykyinen sijainti LiveGPS-tasossa."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Keskitä LiveGPS-taso nykyiseen sijaintiin."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Keskitä LiveGPS-taso jatkuvasti nykyiseen sijaintiin."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12353,24 +12664,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12520,4 +12831,9 @@
 msgstr ""
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Taso"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12565,30 +12881,30 @@
 msgstr "Sallitut toiminnot"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Etähallinta on pyytänyt datan lataamista API:sta."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Pyynnös tiedot: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Sallitaanko tämä?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Varmista etähallinnan toimenpide"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12607,7 +12923,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12616,4 +12930,5 @@
 #: ../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 ""
@@ -12635,25 +12950,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12683,92 +12998,85 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Zoomaus"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+msgid "Show Tile Info"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "zoom-taso"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
 msgstr ""
 
@@ -12782,5 +13090,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12942,5 +13250,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Kadunnimi"
@@ -12988,29 +13296,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13018,33 +13326,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Syötä arvot kaikille ristiriidoille."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Ratkaise ristiriitoja"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13256,8 +13564,4 @@
 msgstr "Korjaa valitut virheet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ohita"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13302,24 +13606,23 @@
 msgstr "Korvaa \"{0}\" → \"{1}\" kohteelle"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Rantaviivat."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Tämä tarkistaa, että rantaviivat ovat oikein."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Yhdistämättömät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "Käännä ja yhdistä"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13342,18 +13645,18 @@
 msgstr "Risteävät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Päällekkäiset pisteet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13605,4 +13908,8 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Poista valittu lähde listasta."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13820,7 +14127,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "rakennus"
@@ -13834,5 +14141,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "alue"
@@ -13842,25 +14149,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Yhdistämättömät polut"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Etsii polut joiden päätesolmu on hyvin lähellä jotain muuta polkua."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Polun päätesolmu lähellä tietä"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Polun päätesolmu lähellä toista polkua"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Polun solmu lähellä toista polkua"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr ""
@@ -13956,21 +14263,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14205,9 +14517,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Luo tyhjä WMS-taso, johon voit avata kuvatiedoston."
@@ -14655,6 +14967,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Numero"
@@ -15216,5 +15528,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15226,5 +15538,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "metsä"
@@ -15512,7 +15824,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "kyllä"
@@ -15661,8 +15973,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "ei"
@@ -15789,31 +16101,4 @@
 msgstr "Muokkaa kiertoliittymän/risteyksen ominaisuuksia"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Tyyppi"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15934,5 +16219,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "asuinkatu"
@@ -15967,5 +16252,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr ""
@@ -16000,5 +16285,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr ""
@@ -16388,12 +16673,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operaattori"
@@ -16606,6 +16891,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr ""
@@ -17032,5 +17317,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "suo"
@@ -17563,25 +17848,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Aukioloajat"
@@ -17647,24 +17932,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17677,24 +17962,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17707,24 +17992,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17757,6 +18042,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr ""
@@ -17772,5 +18057,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "maanalainen"
@@ -17784,5 +18069,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Maksu"
@@ -18018,5 +18303,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr ""
@@ -18484,5 +18769,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Pyöräily"
@@ -18497,5 +18782,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr ""
@@ -18649,16 +18934,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Arkeologinen kaivaus"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Muokkaa piknik-paikan ominaisuuksia"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -18666,55 +18964,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -18722,35 +19020,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -18764,6 +19062,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -19155,30 +19453,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "urheilu"
@@ -19188,227 +19486,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "amerikkalainen jalkapallo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskuksen ominaisuuksia"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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 "tyyppi"
 
 #. item "Sport/Multi" combo "type"
@@ -19445,203 +19796,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "kenttä"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "urheilukeskus"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadion"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Unti"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr ""
@@ -19649,56 +20000,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Ammunta"
@@ -19706,182 +20057,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerikkalainen jalkapallo"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Rakennukset"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Rakennus"
@@ -19889,5 +20240,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -19895,10 +20246,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -19906,10 +20257,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -19917,10 +20268,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -19929,10 +20280,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Vankila"
@@ -19941,10 +20292,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Poliisiasema"
@@ -19954,10 +20305,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -19966,10 +20317,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -19977,5 +20328,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -19983,15 +20334,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Koulu"
@@ -19999,10 +20350,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Yliopisto"
@@ -20010,10 +20361,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Korkeakoulu"
@@ -20021,5 +20372,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -20027,5 +20378,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -20034,10 +20385,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Kirjasto"
@@ -20046,9 +20397,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -20056,10 +20407,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teatteri"
@@ -20068,10 +20419,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr ""
@@ -20081,5 +20432,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr ""
@@ -20088,6 +20439,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Uskonto"
@@ -20096,66 +20447,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr ""
@@ -20164,81 +20515,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -20247,5 +20598,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -20253,5 +20604,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Talon numero"
@@ -20259,20 +20610,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Maakoodi"
@@ -20281,5 +20632,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -20287,61 +20638,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Tehdas"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torni"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20349,25 +20700,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -20375,10 +20726,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -20386,10 +20737,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Putki"
@@ -20398,37 +20749,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "kaasu"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -20438,10 +20789,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Nosturi"
@@ -20449,10 +20800,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Loisto"
@@ -20460,10 +20811,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -20471,10 +20822,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -20482,5 +20833,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
@@ -20488,5 +20839,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr ""
@@ -20496,35 +20847,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr ""
@@ -20533,10 +20884,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -20545,5 +20896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -20551,10 +20902,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -20565,23 +20916,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -20590,75 +20941,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Jännite"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Käymälä"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Puhelin"
@@ -20667,5 +21018,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -20673,5 +21024,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Kolikot"
@@ -20679,5 +21030,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr ""
@@ -20685,5 +21036,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20691,5 +21042,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr ""
@@ -20697,15 +21048,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -20714,5 +21065,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -20720,35 +21071,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Penkki"
@@ -20757,31 +21108,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20852,40 +21203,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "ruoho"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -20894,30 +21244,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Lähde"
@@ -20926,10 +21276,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -20938,10 +21288,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -20949,33 +21299,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -20983,9 +21333,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kioski"
@@ -20993,27 +21343,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -21021,5 +21371,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -21027,88 +21377,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -21116,9 +21466,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Muokkaa lihakaupan ominaisuuksia"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Leipomo"
@@ -21126,9 +21476,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Muokkaa leipomon ominaisuuksia"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr ""
@@ -21136,18 +21486,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Luomukauppa"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Muokkaa luomukaupan ominaisuuksia"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21155,54 +21505,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr ""
@@ -21210,9 +21560,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21220,9 +21570,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -21230,54 +21580,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -21285,9 +21635,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Muokkaa kuivapesulan ominaisuuksia"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Pesula"
@@ -21295,9 +21645,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Muokkaa pesulan ominaisuuksia"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr ""
@@ -21305,28 +21655,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Pankki"
@@ -21334,14 +21684,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -21349,5 +21699,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -21355,15 +21705,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -21371,18 +21721,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -21390,5 +21740,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -21396,9 +21746,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Sairaala"
@@ -21406,10 +21756,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr ""
@@ -21418,5 +21768,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -21425,20 +21775,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -21446,5 +21796,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -21453,59 +21803,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Paikat"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Osavaltio"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Seutu"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr ""
@@ -21513,15 +21868,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Iso kaupunki"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Kaupunki"
@@ -21529,10 +21884,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -21540,25 +21895,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Kunta"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -21566,5 +21921,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr ""
@@ -21572,10 +21927,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Saari"
@@ -21583,10 +21938,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21594,5 +21949,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21600,5 +21955,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -21606,10 +21961,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Huippu"
@@ -21617,10 +21972,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -21628,10 +21983,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -21639,70 +21994,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Kansallinen"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Puu"
@@ -21711,15 +22066,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Metsä"
@@ -21728,5 +22083,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -21734,17 +22089,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -21753,14 +22108,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -21768,25 +22123,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Tunturi"
@@ -21794,10 +22149,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Nummi"
@@ -21805,5 +22160,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Muokkaa nummen ominaisuuksia"
@@ -21811,5 +22166,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -21818,45 +22173,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -21864,25 +22219,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21890,10 +22245,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr ""
@@ -21901,20 +22256,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Puisto"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr ""
@@ -21922,5 +22277,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -21928,15 +22283,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -21944,9 +22299,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -21954,39 +22309,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -21994,15 +22349,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -22010,55 +22365,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr ""
@@ -22068,5 +22423,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr ""
@@ -22075,10 +22430,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr ""
@@ -22086,5 +22441,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr ""
@@ -22093,5 +22448,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -22099,34 +22454,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr ""
@@ -22135,15 +22490,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr ""
@@ -22151,5 +22506,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22158,5 +22513,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22164,5 +22519,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22234,5 +22589,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22241,17 +22596,17 @@
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22304,5 +22659,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22311,13 +22666,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr ""
@@ -22331,10 +22686,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr ""
@@ -22342,31 +22697,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr ""
@@ -22375,30 +22730,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22836,11 +23191,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr ""
@@ -24864,5 +25219,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25534,4 +25889,12 @@
 #.
 #. <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"/>
@@ -25556,5 +25919,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "historiallinen"
@@ -25568,5 +25931,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "louhos"
@@ -25580,5 +25943,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -25600,5 +25963,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "valuma-alue"
@@ -25612,5 +25975,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "talousmetsä"
@@ -25624,5 +25987,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr ""
@@ -25645,5 +26008,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr ""
@@ -25657,5 +26020,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr ""
@@ -25669,5 +26032,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25681,5 +26044,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25693,5 +26056,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25748,7 +26111,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr ""
@@ -25762,5 +26125,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -25773,5 +26136,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "huippu"
@@ -25786,5 +26149,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "jäätikkö"
@@ -25798,5 +26161,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "tulivuori"
@@ -25851,8 +26214,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr ""
@@ -25866,5 +26229,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "pusikko"
@@ -25878,5 +26241,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "nummi"
@@ -25890,8 +26253,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "alue"
+msgstr ""
 
 #. color water
@@ -25903,5 +26265,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "muta"
@@ -25915,5 +26277,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "ranta"
@@ -25991,8 +26353,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "reitti"
@@ -26040,7 +26402,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "raja"
@@ -26190,11 +26552,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr ""
@@ -26242,6 +26604,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "osoite"
@@ -26549,87 +26911,115 @@
 msgstr ""
 
+#~ msgid "File could not be found."
+#~ msgstr "Tiedostoa ei löytynyt."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Valitse vähintään yksi ladattava tietolaji."
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Ristiriidassa oleva relaatio"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Virhe jäsennettäessä"
+
+#~ msgid "File not found"
+#~ msgstr "Tiedostoa ei löytynyt"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Ole hyvä ja lisää halutut koordinaatit ensin."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Valitse ensin kirjanmerkki."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Anna haettava merkkijono"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
+
+#~ msgid "name"
+#~ msgstr "nimi"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
+#~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
+
+#~ msgid "Unknown version"
+#~ msgstr "Tuntematon versio"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Tallentamattomia muutoksia"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lisää valitut objektit jäseniksi"
+
+#~ msgid "Revert"
+#~ msgstr "Palauta"
+
+#~ msgid "Date"
+#~ msgstr "Päivämäärä"
+
+#~ msgid "Object"
+#~ msgstr "Objekti"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
+
+#~ msgid "Open in Browser"
+#~ msgstr "Avaa selaimessa"
+
+#~ msgid "Email"
+#~ msgstr "Sähköpostiosoite"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Tuntematon tiedostopääte."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Yhdistämisristiriidat"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
+
+#~ msgid "my version:"
+#~ msgstr "minun versioni:"
+
+#~ msgid "their version:"
+#~ msgstr "palvelimen versio:"
+
+#~ msgid "Change"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Poista {1} {0}"
+
+#~ msgid "Move"
+#~ msgstr "Siirrä"
+
+#~ msgid "position"
+#~ msgstr "sijainti"
+
+#~ msgid "false"
+#~ msgstr "epätosi"
+
+#~ msgid "true"
+#~ msgstr "tosi"
+
+#~ msgid "different"
+#~ msgstr "eri"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Virhe ladattaessa sivua {0}"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Käytä esivalintaa ”{0}”"
-
-#~ msgid "Unknown version"
-#~ msgstr "Tuntematon versio"
-
-#~ msgid "Aborting..."
-#~ msgstr "Keskeytetään..."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Tallentamattomia muutoksia"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Revert"
-#~ msgstr "Palauta"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "Object"
-#~ msgstr "Objekti"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
-
-#~ msgid "Open in Browser"
-#~ msgstr "Avaa selaimessa"
-
-#~ msgid "Email"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tuntematon tiedostopääte."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Yhdistämisristiriidat"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
-
-#~ msgid "my version:"
-#~ msgstr "minun versioni:"
-
-#~ msgid "their version:"
-#~ msgstr "palvelimen versio:"
-
-#~ msgid "Change"
-#~ msgstr "Muokkaa"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Poista {1} {0}"
-
-#~ msgid "Move"
-#~ msgstr "Siirrä"
-
-#~ msgid "position"
-#~ msgstr "sijainti"
-
-#~ msgid "false"
-#~ msgstr "epätosi"
-
-#~ msgid "true"
-#~ msgstr "tosi"
-
-#~ msgid "different"
-#~ msgstr "eri"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
 
 #~ msgid "unnamed"
@@ -26698,4 +27088,7 @@
 #~ "yritä myöhemmin uudestaan."
 
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Käytä esivalintaa ”{0}”"
+
 #~ msgid "There were conflicts during import."
 #~ msgstr "Tuonnin aikana oli ristiriitoja."
@@ -26735,4 +27128,7 @@
 #~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
+
 #~ msgid "JOSM Online Help"
 #~ msgstr "JOSM-verkko-ohje"
@@ -26777,4 +27173,7 @@
 #~ msgstr[0] "{0} objektilla on ristiriita:"
 #~ msgstr[1] "{0} objektilla on ristiriitoja:"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
 
 #~ msgid "Found <member> element in non-relation."
@@ -26827,13 +27226,4 @@
 #~ "{0}"
 
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} liitännäinen päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM "
-#~ "uudelleen."
-#~ msgstr[1] ""
-#~ "{0} liitännäistä päivitettiin onnistuneesti. Ole hyvä ja käynnistä JOSM "
-#~ "uudelleen."
-
 #~ msgid "Metacarta Map Rectifier image id"
 #~ msgstr "Metacarta Map Rectifier:in kuvatunnus (id)"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 18273)
+++ applications/editors/josm/i18n/po/fr.po	(revision 18508)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-22 06:57+0000\n"
-"Last-Translator: bart95130 <marc.lecrosnier@free.fr>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-05 08:28+0000\n"
+"Last-Translator: Baptiste Darthenay <e5p3r0-rosetta@yahoo.fr>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -14,68 +14,68 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:07+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
-msgstr "Création de l’interface graphique d'utilisateur (GUI)"
+msgstr "Création de l’interface utilisateur"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Aide"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Ignorant l’URL mal-formée : \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+msgstr "URL mal-formée ignoré : \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -88,12 +88,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -103,14 +97,14 @@
 msgstr "Avertissement"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "URL malformée ignorée dans le fichier : \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
@@ -119,13 +113,12 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -133,23 +126,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -157,5 +151,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -164,21 +158,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -187,5 +182,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -198,17 +193,9 @@
 msgstr "Erreur"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "INCONNU"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "À propos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Afficher l’À propos."
@@ -216,37 +203,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Éditeur Java OpenStreetMap"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Dernier changement le {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Version de Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Page d’accueil"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Rapports d'erreur"
@@ -256,5 +243,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -262,33 +249,29 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Lisez-moi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Révision"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Contribution"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licence"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Greffons"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "À propos de JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Impossible de trouver le fichier."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -328,42 +311,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -371,5 +353,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -383,19 +365,19 @@
 "Veuillez sélectionner au moins un nœud, chemin ou relation déjà chargé."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Veuillez sélectionner le calque de destination."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Sélectionnez le calque de destination"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Fusionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -406,50 +388,50 @@
 "puisse être fusionné.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Pas de calque de destination"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Ajouter un nœud..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Ajouter un nœud en indiquant une latitude et une longitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Modifier : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Entrer les coordonnées pour le nouveau nœud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Utiliser des degrés décimaux."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Les valeurs négatives indiquent la partie Ouest/Sud de l'hémisphère."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -458,5 +440,5 @@
 msgstr "Latitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -465,27 +447,27 @@
 msgstr "Longitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Placer les nœuds en cercle"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Déplacer les nœuds sélectionnés en un cercle."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -495,5 +477,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -509,30 +491,28 @@
 msgstr "Outil : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Veuillez sélectionner au moins quatre nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -542,84 +522,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Aligner les nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Déplacer les nœuds sélectionnés sur une ligne."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Veuillez sélectionner au moins trois nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "les données"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "le calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "le conflit"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom sur {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoomer la vue sur {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Afficher : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Rien de sélectionné sur lequel zoomer."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Aucun conflit sur lequel zoomer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Fermer les ensembles de changements"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Ferme les ensembles de changements"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -627,37 +607,37 @@
 msgstr "Fichier : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Il n'y a pas d'ensembles de changements ouverts"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Pas d'ensembles de changements ouverts"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Téléchargement des ensembles de changements ouverts"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Fusionner des chemins"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Fusionner plusieurs chemins en un seul."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Changer les directions ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Inverser et fusionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -667,5 +647,5 @@
 "la même direction. En retourner certaines ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -675,41 +655,41 @@
 "une seule chaîne de nœuds)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Fusionner {0} voies"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Veuillez sélectionner au moins deux chemins à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Copier"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Copier les objets sélectionnés dans la mémoire tampon."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Veuillez sélectionner quelque chose à copier."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Créer un cercle"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Créer un cercle à partir de trois nœuds sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Ces nœuds ne sont pas en cercle. Abandon."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -719,16 +699,14 @@
 "exactement deux ou trois nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -740,5 +718,5 @@
 msgstr "Supprimer"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Supprimer les objets sélectionnés."
@@ -746,6 +724,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -759,54 +737,29 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Distribuer les nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Distribue les nœuds sélectionnés à égale distance le long d'une ligne."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Téléchargement depuis OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Télécharger des données depuis le serveur OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Téléchargement"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Veuillez sélectionner au moins une tâche à télécharger"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr "é"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
@@ -814,20 +767,22 @@
 "sélectionnées"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr "requis : Id > 0 actuellement : {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -836,39 +791,39 @@
 msgstr "Le paramètre ''{0}'' ne doit pas être nul."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Il y a eu {0} conflits durant l'import."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Conflits durant le téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Téléchargement des parents des primitives {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr "({0}/{1}) Chargement des parents du nœud {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Téléchargement des parents des primitives {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr "({0}/{1}) Chargement des parents du way {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Téléchargement des parents des primitives {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr "({0}/{1}) Chargement des parents de la relation {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Dupliquer"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Dupliquer la sélection par un copier-coller immédiat."
@@ -878,41 +833,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Quitter"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Quitter l’application."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Tous les formats"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Exporter en GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exporter les données vers un fichier GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Rien à exporter. Obtenez d’abord des données."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -951,6 +906,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -969,9 +924,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -991,5 +946,5 @@
 msgstr "le paramètre \"{0}\" ne doit pas être vide"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -997,36 +952,36 @@
 msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Exporter en fichier GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
 msgstr "historique de l'objet"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Affiche l’historique des chemins, nœuds et relations d’OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Information sur l’élément"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Affiche les informations à propos des nœuds, chemins ou relations OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Joindre le nœud au chemin"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Joindre un nœud au chemin le plus proche."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Joindre le nœud et la ligne"
@@ -1036,171 +991,189 @@
 msgstr "Pas de raccourci"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Fusionner le calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Fusionne le calque courant avec un autre calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Fusionner les nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Fusionner les nœuds sur le plus ancien"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Veuillez sélectionner au moins deux nœuds à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Interruption en cours..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Impossible de fusionner les nœuds : cela obligerait à supprimer un chemin "
 "encore utilisé"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Fusionner {0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Fusionner la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Fusionne les primitives sélectionnées avec un autre calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Mirroir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Inverse les nœuds et chemins sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Veuillez sélectionner au moins un nœud ou chemin"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "haut"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Déplacer des objets {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "bas"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "gauche"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "droite"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Déplacer {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Déplacer les objets {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Impossible de déplacer des objets en dehors de la Terre."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Nouveau"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Créer une nouvelle carte."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Ouvrir un fichier"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Ouverture des fichiers"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Ouverture du fichier ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Ouvrir un emplacement..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Ouvrir une URL."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Calque séparé"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 "Sélectionner si les données doivent être télécharger dans un nouveau calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Saisir l'URL à télécharger :"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Entrer l'URL depuis laquelle les données seront téléchargées"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Emplacement de téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Télécharger l'URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr "Commencer le téléchargement des données"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "Fermer cette fenêtre et annuler le téléchargement"
 
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Télécharger les données."
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Rendre une forme orthogonale"
@@ -1210,18 +1183,18 @@
 msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr "Mise en forme orthogonale / Annuler"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+msgstr "Annuler la mise forme orthogonale de certains nœuds"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+msgstr "Mise en forme orthogonale / Annuler"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1229,10 +1202,13 @@
 "action!"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+"Forme orthogonale / Annuler\n"
+"Veuillez sélectionner les nœuds qui ont été déplacés par la dernière mise en "
+"forme orthogonale"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+msgstr "Annuler la mise en forme orthogonale"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1245,37 +1221,38 @@
 "vous continuer ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+msgstr "Utilisation"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+msgstr "Les éléments sélectionnés ne peuvent être mis en forme orthogonale"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Orthogonaliser"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Coller"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Coller les contenus du presse-papier."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Coller les attributs"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
 "Appliquer les attributs de la mémoire tampon aux éléments sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1284,5 +1261,5 @@
 msgstr[1] "Collage des tags {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1291,59 +1268,59 @@
 msgstr[1] "vers les primitives {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Configuration..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Ouvrir la page des préférences pour les réglages généraux."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Refaire"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Refaire la dernière action annulée"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Renommer le calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Renommer également le fichier"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Impossible de renommer le fichier \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Inverser les chemins"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Inverser la direction de tous les chemins sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Veuillez sélectionner au moins un chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Inverser les chemins"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1351,10 +1328,10 @@
 msgstr "Sauvegarder"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Sauvegarder les données actuelles."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1405,21 +1382,21 @@
 msgstr "Sauvegarder le calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Enregistrer sous…"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Sauvegarder les données actuelles dans un nouveau fichier."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1429,10 +1406,10 @@
 "sélectionne aussi les objets incomplets."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Afficher le rapport de statut"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1440,19 +1417,19 @@
 "attachées aux bogues."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Aide : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Rapport d'état"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Copier vers le presse-papier et fermer"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1461,18 +1438,18 @@
 msgstr "Fermer"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Couper un chemin"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Séparer un chemin au nœud sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "La sélection actuelle ne peut pas être utilisée pour couper un chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1480,5 +1457,5 @@
 msgstr[1] "Les nœuds sélectionnés ne sont pas au milieu d'un chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1494,9 +1471,9 @@
 "sélectionner le chemin également."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Les nœuds sélectionnés ne font pas partie du même chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1504,11 +1481,11 @@
 msgstr[1] "Le chemin sélectionné ne contient pas tous les nœuds sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "Vous devez sélectionner au moins deux nœuds pour séparer une voie circulaire."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1540,60 +1517,60 @@
 msgstr "Couper le chemin {0} en {1} parties"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Utiliser les lignes GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Dessiner des lignes entre les points GPS bruts."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Passer à la configuration globale \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Séparer les chemins"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Dupliquer les nœuds utilisés par plusieurs chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Ce nœud n’est pas collé à quelque chose d’autre."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Aucun de ces nœuds ne sont collés à autre chose."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Aucun des nœuds de ce chemin ne sont collés à autre chose."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Rien ne peut être séparé dans la sélection actuelle."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Sélectionner au choix :"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Un nœud taggué, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nœud utilisé par plus d’un chemin, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Un nœud utilisé par plus d’un chemin et un de ces chemins, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1601,10 +1578,10 @@
 "* Un chemin qui a un ou plusieurs nœuds utilisés par plus d’un chemin, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "* Un chemin et un ou plus de ses nœuds utilisés par plus d’un chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1618,9 +1595,9 @@
 "sélectionnés."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Nœud séparé"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1628,58 +1605,59 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Dupliquer {0} nœuds en {1} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Annuler"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Annuler la dernière action."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Tout dé-sélectionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Dé-sélectionner tous les objets."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Désélectionner tout (Focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Désélectionner tout (Echap)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Actualiser les données."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
 msgstr "Actualise les éléments du calque courant depuis le serveur."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Mise à jour des données"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr "Télécharger les données."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Pas de jeu de données courant trouvé"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
@@ -1688,9 +1666,9 @@
 "courant"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Actualiser les éléments sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
@@ -1699,13 +1677,13 @@
 "les données)."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Mettre à jour la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Il n'y a pas de primitive sélectionnée à mettre à jour."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "La sélection est vide"
@@ -1717,9 +1695,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr ""
 "Envoyer tout les changements dans le calque courant vers le serveur d'OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1730,5 +1709,5 @@
 "les résoudre d'abord.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1736,29 +1715,29 @@
 msgstr "Aucun changement à envoyer."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Rien à envoyer. Obtenez d’abord des données."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr "Synchroniser seulement les noeuds {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr "Synchroniser seulement les chemins {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Synchroniser seulement les relations {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Synchroniser tout le jeu de données"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1780,11 +1759,11 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Conflits détectés"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1800,5 +1779,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1811,23 +1790,22 @@
 "nouveau avec un nouveau changeset ou avec un changeset existant.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Ensemble de changement fermé"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Annuler la résolution des conflits"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr "Prépare la résolution de conflits"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+msgstr "Cliquer pour télécharger tous les ways parents du nœud {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr "Cliquer pour annuler et reprendre l'édition de la carte"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1838,29 +1816,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
-"Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>L’envoi a <strong>échoué</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "L’envoi vers l’API OSM a échoué"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Mise à jour des primitives"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1869,19 +1837,37 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, fuzzy, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
 msgstr ""
 "Attention: le primitif \"{0}\" est déjà effacé sur le serveur. Il sera "
 "ignoré pour compléter l'envoi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, fuzzy, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+"Attention: le primitif \"{0}\" est déjà effacé sur le serveur. Il sera "
+"ignoré pour compléter l'envoi."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Changer {0} objet."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"Ignore l'exception car le téléchargement a été annulé. L'exception était : "
+"{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Envoyer la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1901,11 +1887,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Zoom avant"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Zoom arrière"
@@ -1985,21 +1971,17 @@
 msgstr "Avancer plus lentement"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Téléchargement des données GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Données GPX téléchargées"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Données GPS brutes"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Téléchargement des données"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -2009,28 +1991,39 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "Pas de donnée trouvée dans cette zone."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Données OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Téléchargement de {0} de {1} ({2} restant(s))"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-"Les erreurs suivantes ont été rencontrées lors du téléchargement groupé : {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Erreurs durant le téléchargement"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Mise à jour des données"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "visible (sur le serveur)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Cliquer pour annuler et reprendre l'édition de la carte"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2048,7 +2041,23 @@
 "ignorer.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Primitives supprimées ou déplacées"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+"Les erreurs suivantes ont été rencontrées lors du téléchargement groupé : {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Erreurs durant le téléchargement"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Erreurs durant le téléchargement"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2070,5 +2079,5 @@
 msgstr "Mode: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2099,38 +2108,38 @@
 msgstr "sélectionné"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 msgid "Connect existing way to node"
 msgstr "Connecter le chemin existant au nœud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549
 msgid "Add a new node to an existing way"
 msgstr "Ajouter un nœud à un chemin existant."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:551
 msgid "Add node into way and connect"
 msgstr "Ajouter un nœud sur le chemin et le connecter"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Créer un nouveau nœud."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Sélectionner le nœud sous le curseur."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2139,14 +2148,14 @@
 msgstr[1] "Ajouter un nouveau nœud aux {0} chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 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:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Continuer le chemin à partir du dernier nœud."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Terminer le tracé."
@@ -2166,5 +2175,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2178,5 +2187,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Relacher le bouton de souris pour arrêter la rotation."
@@ -2242,5 +2251,5 @@
 msgstr "Toujours déplacer et ne plus montrer cette fenêtre de dialogue"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2249,5 +2258,5 @@
 "fusionner avec le nœud le plus proche."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2260,4 +2269,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zoom"
@@ -2278,5 +2288,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Recherche..."
@@ -2380,20 +2389,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - objet avec le nombre de nœuds spécifié"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - tous les objets modifiés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - tous les objets sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - tous les objets incomplets"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - tous les objets non étiquetés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2402,5 +2418,5 @@
 "l'expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2409,18 +2425,18 @@
 "l'expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Utilisez <b>|</b> ou <b>OR</b> pour combiner avec le OU logique"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Utilisez <b>\"</b> pour citer des opérateurs (i.e. si la clé contient :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Utilisez <b>(</b> et <b>)</b> pour grouper des expressions"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2430,51 +2446,51 @@
 msgstr "Filtrez"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Chercher"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "appliquer le filtre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Commencer la recherche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Aucun résultat trouvé pour \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Rien n’a été enlevé à la sélection en recherchant \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} résultats trouvés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2510,30 +2526,31 @@
 "relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Jeton inattendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Arguments manquants pour le OU"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Arguments manquants pour le -"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Les parenthèses doivent être fermées."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
-msgid "Wrong number of parameters for nodes operator."
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
 msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
-#, java-format
-msgid ""
-"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-"nodes or range, for example nodes:10-20"
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
 msgstr ""
 "Valeur incorrecte lors de l’opération sur les nœuds : {0}. Les opérations "
@@ -2541,5 +2558,19 @@
 "10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+msgid "Wrong number of parameters for nodes operator."
+msgstr "Erreur de nombre de paramètre pour une opération sur des nœuds."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+#, java-format
+msgid ""
+"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
+"nodes or range, for example nodes:10-20"
+msgstr ""
+"Valeur incorrecte lors de l’opération sur les nœuds : {0}. Les opérations "
+"sur les nœuds requièrent des nombres ou des plages de nombres, par exemple : "
+"10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2645,4 +2676,20 @@
 msgstr "Dépendances cycliques."
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2660,8 +2707,8 @@
 msgstr "Ajouter la relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Objets ''{0}'' purgés"
+msgstr "{0} objets ajoutés"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2742,5 +2789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Double conflit"
@@ -2764,4 +2811,6 @@
 "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
 msgstr ""
+"Impossible d’annuler la commande « {0} » parce que la couche « {1} » n’est "
+"plus présente"
 
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
@@ -2776,4 +2825,15 @@
 msgstr "impossible de résoudre un conflit non arbitré"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "Le paramètre \"{0}\" ne doit pas être vide."
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2804,33 +2864,6 @@
 msgstr[1] "Supprimer {0} relations"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Relation conflictuelle"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Supprimer de la relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le rôle "
-"{2}.<br>Enlever de la relation ?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>La sélection \"{0}\" est utilisée par la relation \"{1}\".<br>Enlever "
-"de la relation ?</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Séparer le segment du chemin"
@@ -2838,6 +2871,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2849,5 +2882,5 @@
 "voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Confirmation de suppression"
@@ -3037,15 +3070,30 @@
 msgstr "Correction automatique d’attribut"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "La valeur par défaut est \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Attention : impossible de forcer les préférences pour ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Erreur dans le fichier de configuration aux lignes {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3054,5 +3102,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3061,5 +3109,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3068,5 +3116,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3075,5 +3123,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3083,5 +3131,5 @@
 "préférences par défaut."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3092,5 +3140,5 @@
 "fichier par défaut."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3099,5 +3147,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3109,5 +3157,5 @@
 "préférences par défaut.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3116,19 +3164,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Préférences sauvegardées sur {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Impossible de charger les préférences. Raison : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Impossible de charger les préférences depuis le serveur."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3137,5 +3208,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr "Envoyer le calque ''{0}'' sur le serveur ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "INCONNU"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3157,20 +3248,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "O"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "E"
@@ -3182,4 +3273,18 @@
 msgid "Changeset {0}"
 msgstr "Ensemble de changements {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3246,14 +3351,14 @@
 msgstr "Attention : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+msgstr "Une primitive avec un ID égal à 0 ne peut pas être invisible."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3261,5 +3366,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3286,6 +3391,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3348,109 +3453,109 @@
 "le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "La zone n'est pas fermée."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Le multipolygone \"{0}\" n'est pas fermé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Membre \"{0}\" supprimé de la relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Chemin \"{0}\" comporte moins de deux points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Plus d'un chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Plus d'un chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Plus d'un \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rôle inconnu \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Type de membre inconnu pour \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Pas de chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Pas de chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Pas de noeud ou de chemin \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Le style de la restriction {0} n'a pas été trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Le chemin intérieur \"{0}\" est à l'extérieur."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-chemin \"{0}\" dans le multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Le chemin intérieur \"{0}\" est à l'extérieur."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
@@ -3458,5 +3563,5 @@
 "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3472,11 +3577,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "texte"
+msgstr "zone de texte"
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3495,5 +3599,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3504,5 +3607,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3531,5 +3633,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "arrière-plan"
@@ -3563,12 +3665,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambert Zone (France)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambert Zone (France)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3604,10 +3704,10 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3636,5 +3736,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "voie ferrée"
@@ -3651,4 +3751,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3664,33 +3766,33 @@
 msgstr[1] "{0} membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Condition préalable non remplie"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Exception de sécurité"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Exception de réseau"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "Exception E/S"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Erreur interne du serveur"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Requête incorrecte"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr "Non trouvé"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3698,18 +3800,18 @@
 msgstr "Conflit"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Hôte inconnu"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr "Objet effacé"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
-msgstr ""
+msgstr "Montrer l'aide"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3720,4 +3822,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Téléchargement du \"Message du jour\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Fermer la boîte de dialogue"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3789,74 +3896,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "Options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Montrer cette aide"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Argument de géométrie standard UNIX"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Télécharge la zone sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Télécharge l’emplacement donné par l’URL (avec lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Ouvrir fichier (données brutes gps, si .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Télécharger la zone sélectionnée en données GPS brut."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Sélectionner avec la recherche actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Lancer maximisé"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Rétablir les préférences par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Définir la langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CHEMIN/VERS/REPERTOIRE/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 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:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3868,9 +3975,9 @@
 "      pour augmenter la taille maximale de mémoire allouée"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "exemples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3881,25 +3988,25 @@
 "sur d’avoir chargé des données avant --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Au lieu de --download=<bbox> vous devriez indiquer osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Activation des greffons mis à jour"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Chargement des premiers greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Régalage des valeurs par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Chargement des greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3912,11 +4019,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3941,6 +4048,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4041,25 +4148,22 @@
 msgstr "(aucun objet)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "Utilisateur :"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "le calque n’est pas dans la liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "La couche \"{0}\" doit se trouver dans la liste des couches"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Erreur d’analyse"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Fichier non trouvé"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Non, annuler l’opération"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4083,5 +4187,5 @@
 "non défini : ne pas utiliser cette propriété sur les objets sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4093,4 +4197,6 @@
 "relation</strong>.</html>"
 msgstr ""
+"<html>Veuillez confirmer la suppression d'<strong>1 object</strong> "
+"depuis<strong>1 relation</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
@@ -4108,26 +4214,25 @@
 "relations</strong>.</html>"
 msgstr ""
+"<html>Veuillez confirmer la suppression de<strong>{0} object</strong> "
+"depuis<strong>{1} relation</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Supprimer {0} objet"
-msgstr[1] "Supprimer {0} objets"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Supprimer {0} objet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "non supprimé"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4139,5 +4244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4186,5 +4291,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4201,5 +4306,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4418,8 +4523,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4746,6 +4851,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4759,6 +4864,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4816,36 +4921,36 @@
 msgstr "Leur jeu de données n’inclue pas d’étiquette avec la clé {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr "Pas de conflits à résoudre."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
 msgstr "Annuler la résolution des conflits"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
 msgstr "Appliquer les conflits résolus."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Appliquer"
@@ -4857,5 +4962,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "all"
@@ -4945,4 +5050,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4953,4 +5060,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4964,49 +5072,86 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr "Supprimer ce membre de la relation de la relation."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Remplacer"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "Conserver ma version"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Supprimer ce membre de la relation de la relation."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr "Non décidé"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr "Pas encore décidé."
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Rôle :"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Définir un rôle pour les membres sélectionnés"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#, fuzzy
+msgid "Tag modified relations with "
+msgstr "Attributs issus de relations"
+
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
 msgctxt "tag"
 msgid "Key:"
 msgstr "Attribut"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>L’envoi a <strong>échoué</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Valeur :"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "Appliquer ce rôle à tout les membres."
@@ -5043,6 +5188,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5133,10 +5278,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5203,5 +5345,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5246,4 +5389,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Activer"
@@ -5269,6 +5413,6 @@
 msgstr "Informations à propos du calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5277,22 +5421,22 @@
 msgstr[1] "Cela modifiera {0} objets maximum."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Une valeur vide supprime la clé."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<différent>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Changer les valeurs ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5301,70 +5445,74 @@
 msgstr[1] "Modifier les propriétés de {0} objets maximum."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Veuillez sélectionner une clé"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Veuillez sélectionner une valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Veuillez sélectionner les objets dont vous voulez changer les propriétés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Propriétés/Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Propriétés des objets sélectionnés."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Membre de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Ajouter des Propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Éditer les propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriétés : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Propriétés / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Changer la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Supprimer de la relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Supprimer vraiment la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée de tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Supprimer les propriétés"
@@ -5372,34 +5520,34 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Ouvrir une liste de toutes les relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Ouvrir un éditeur pour la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Supprimer la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Créer une nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5407,7 +5555,27 @@
 "d'édition"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Supprimer la relation sélectionnée"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Sélectionner au choix :"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Télécharger les relations sélectionnée."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Télécharger les membres"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5434,5 +5602,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5444,9 +5612,9 @@
 msgstr "Sélection : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Détacher le panneau"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5455,5 +5623,5 @@
 "d'outils de gauche."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Cliquer pour minimiser/maximiser le contenu du panneau"
@@ -5536,5 +5704,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "télécharger les membres de la relation"
@@ -5566,5 +5735,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5572,18 +5741,18 @@
 "Attention : exception ignorée car la tâche est annulée. Exception : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Étiquettes et membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr "Relations parentes"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr "Relations enfants"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5596,14 +5765,14 @@
 "circulaires ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr "Les ignorer, laisser la relation telle quelle."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5613,9 +5782,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5625,5 +5794,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5632,5 +5801,5 @@
 "premier membre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5639,5 +5808,5 @@
 "dernier membre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5645,5 +5814,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5651,20 +5820,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr "Éditeur de relation : supprimer la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5673,67 +5842,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "trier les membres de la relation"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "éditeur de relation : trier"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Déplacer les membres sélectionnés vers le haut"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "Éditeur de relation : déplacer vers le haut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Déplacer les membres sélectionnés vers le bas"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "Éditeur de relation : déplacer vers le bas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr "Supprimer le membre actuellement sélectionné de cette relation."
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "éditeur de relation : supprimer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr "Supprimer la relation actuellement éditée."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "Oui, créer un conflit et fermer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Oui, créer un conflit et fermer."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "Non, continuer à éditer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5742,9 +5910,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "Conflit dans les données."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5753,41 +5921,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "Appliquer les mises-à-jour suivantes"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Appliquer les changements et fermer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Annuler les changements et fermer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Ajouter un attribut vide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Télécharger tous les chemins et les nœuds incomplets dans la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Télécharger les membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr "Éditeur de relation : télécharger les membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Définir un rôle pour les membres sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Appliquer le rôle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5797,17 +5965,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "Oui, l'appliquer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "Non, ne pas l'appliquer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "éditer la relation en référence du membre de relation sélectionné"
@@ -5818,13 +5986,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5838,14 +6006,14 @@
 msgstr "Lié"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr "télécharger les relations référentes"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5876,5 +6044,5 @@
 #, java-format
 msgid "Create new relation in layer ''{0}''"
-msgstr "créer une nouvelle relation dans la couche \"{0}\""
+msgstr "Créer une nouvelle relation dans la couche \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -5896,60 +6064,89 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Pas connecté"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "trier les membres de la relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "trier les membres de la relation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Marque-pages"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Veuillez d’abord saisir les coordonnées désirées."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#, fuzzy
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "Aucun ensemble de changements n'est actuellement ouvert."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Créer la frontière"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "éditer la relation sélectionnée"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Entrer un nom pour cet emplacement."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Sélectionner un marque-page en premier."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Déplacer les membres sélectionnés vers le haut"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Déplacer les membres sélectionnés vers le haut"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "lat min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "lon min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "lat max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "lon max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5959,22 +6156,74 @@
 "télécharger la zone)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Zone de délimitation"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Sources et types de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Données OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Séparer un chemin au nœud sélectionné."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Données GPS brutes"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Le chemin sélectionné ne contient pas le nœud sélectionné"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Télécharger en tant que nouveau calque"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Télécharger zone"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Téléchargement"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Aucune relation sélectionnée"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5982,5 +6231,5 @@
 "le serveur"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5988,347 +6237,62 @@
 "serveur"
 
-#. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-"Échec (NullPointerException). Sans doute parce qu'il manque des attributs."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Veuillez saisir une chaîne de caractères pour la recherche"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr ""
-"Impossible de lire les résultats de recherche du lieu depuis le serveur"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Fermer cette fenêtre et annuler le téléchargement"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "éditer la relation sélectionnée"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Veuille sélectionnez la rangée à éditer."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
 msgid "Enter a place name to search for:"
 msgstr "Entrez un nom d’endroit à rechercher :"
 
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Lieux/endroits"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "nom"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "type"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "à côté de"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Carte glissante"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "niveau de zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x de"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "à"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y de"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Numéros des tuiles"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>Impossible de se connecter au serveur distant<br>''{0}''.<br>Vérifiez "
-"votre connexion internet.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
 #, fuzzy
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-"Attention : impossible d'afficher une fenêtre de dialogue au premier plan. "
-"L'exception était : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "Historique du nœud {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "Historique du chemin {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "Historique de la relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Fermer la boîte de dialogue"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"historique pas encore initialisé. Impossible de définir la référence de la "
-"primitive."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-"échec de la définition de la référence. la référence de version {0} n’est "
-"pas disponible dans l’historique"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-"Historique non encore initialisé. Impossible de définir la primitive "
-"courante."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-"impossible de définir l’en-cours. la version actuelle {0} n’est pas "
-"disponible dans l’historique"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Chargement de l'historique"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Nœud {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Chemin {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relation {0}"
+msgid "Enter a place name to search for"
+msgstr "Entrez un nom d’endroit à rechercher :"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+"Échec (NullPointerException). Sans doute parce qu'il manque des attributs."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Recherche..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Direction vers laquelle chercher de la terre"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6685,4 +6649,6 @@
 #. 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" />
@@ -7063,6 +7029,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7128,11 +7095,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7142,6 +7109,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7151,79 +7118,354 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Nom"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Type"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "à côté de"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Carte glissante"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "niveau de zoom"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x de"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "à"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y de"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Numéros des tuiles"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "Historique du nœud {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "Historique du chemin {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "Historique de la relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Fermer la boîte de dialogue"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+"historique pas encore initialisé. Impossible de définir la référence de la "
+"primitive."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+"échec de la définition de la référence. la référence de version {0} n’est "
+"pas disponible dans l’historique"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+"Historique non encore initialisé. Impossible de définir la primitive "
+"courante."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+"impossible de définir l’en-cours. la version actuelle {0} n’est pas "
+"disponible dans l’historique"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Chargement de l'historique"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Nœud {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Chemin {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7307,4 +7549,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7609,6 +7852,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0} objet à modifier :"
@@ -7712,5 +7955,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"Attention: le primitif \"{0}\" est déjà effacé sur le serveur. Il sera "
+"ignoré pour compléter l'envoi."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7740,59 +7994,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Images pour {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Lecture GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Aucune heure pour le point {0}·x·{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Impossible de lire l’heure \"{0}\" du point {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lecture de {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Aucune image avec des informations horaires lisibles trouvée."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lecture de {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Images géolocalisées"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Allumage du GPS : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Extinction du GPS : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "variation différentielle actuelle : {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "différence de fuseau horaire : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7800,51 +8054,51 @@
 msgstr[1] "images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} dans la trace."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Synchroniser l’horloge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "images JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "La date du fichier \"{0}\" n'a pas pu être analysée."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Il n’y a aucune heure EXIF associée au fichier \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Image"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Entrez la date et l’heure montrées (mm/jj/aaaa HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Fuseau horaire de l'instrument GPS (différence avec la photo)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synchroniser l’heure avec l’instrument GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "La date indiquée ne peut être analysée."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7852,30 +8106,30 @@
 msgstr "point GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Utiliser les réglages généraux."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Dessiner des lignes entre les points pour ce calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Sélectionner les options de dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7883,5 +8137,5 @@
 msgstr "Personnaliser la couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7890,5 +8144,5 @@
 msgstr "Par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7897,43 +8151,43 @@
 msgstr "Choisir une couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Marqueurs depuis des points nommés"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Points de parcours nommés depuis {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importer Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Fichiers audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marqueurs audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importer des images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Nom : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Description : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7943,28 +8197,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "Longueur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Longueur : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7973,5 +8227,5 @@
 msgstr[1] "{0} chemins, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7980,10 +8234,10 @@
 msgstr[1] "{0} chemins"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7994,11 +8248,11 @@
 "regardez ici :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -8008,29 +8262,29 @@
 msgstr "Converti depuis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Télécharger depuis OSM le long de cette trace"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Tout télécharger dans un rayon de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} mètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Aire maximale par requête:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -8041,9 +8295,5 @@
 "Voulez-vous<br>continuer ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr "Télécharger les données."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -8051,5 +8301,5 @@
 "audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8059,5 +8309,5 @@
 "chemin ont été omis ou déplacés au début."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8067,19 +8317,19 @@
 "estimer leur horodatage ont été omis."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Couche de données {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "en dehors de la zone téléchargée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
@@ -8087,5 +8337,5 @@
 "0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8094,39 +8344,56 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Fermer cette fenêtre et annuler le téléchargement"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} supprimés)"
+msgstr[1] " ({0} supprimés)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} est consistué de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} supprimés)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "non défini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "Version de l’API : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8301,6 +8568,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8315,6 +8580,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8507,5 +8770,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8857,21 +9120,20 @@
 msgstr "Langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Activer les valeurs par défaut intégrées"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
-msgid "Map Paint Styles"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
 msgid "Used style"
 msgstr "style utilisé"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+msgid "Map Paint Styles"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -8885,6 +9147,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Actualiser"
@@ -9036,70 +9297,108 @@
 msgstr "Raccourci"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Activer"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr "Chemins des icônes"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Description brève : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "auteur : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "page web : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr "Chemins des icônes"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Copier les valeurs par défaut"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Veuillez sélectionner la colonne à copier"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr "Ajouter une nouvelle source XML à la liste"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Supprimer la source sélectionnée de la liste."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-"Paramètres par défaut (voir info-bulle pour obtenir des informations "
-"détaillées)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Supprimer les éléments sélectionnés de la liste des éléments fusionnés"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "Supprimer les éléments sélectionnés de la liste des éléments fusionnés"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "AJouter un nouvel attribut"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Fermer les ensembles de changements sélectionnés"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Modifier la source sélectionnée."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Envoi des données pour le calque ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Impossible de charger l’historique depuis le serveur. Détails :<br>{0}"
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, fuzzy, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+"format inattendu de nouvelle version d’une primitive modifiée \"{0}\", reçu "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Trier le menu des balises"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9302,5 +9601,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Plus d'informations à propos de cette balise"
@@ -9365,16 +9664,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Groupe de balises \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Groupe de balises \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9382,5 +9681,5 @@
 msgstr "Contact du serveur OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9492,5 +9791,5 @@
 msgstr "Échec de l’analyse du fichier \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -9728,5 +10027,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9753,5 +10052,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9759,5 +10058,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9770,5 +10069,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9779,33 +10078,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Mot de passe ou nom d’utilisateur incorrect."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Attention : Le mot de passe est transféré non-crypté."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Sauvegarder l’utilisateur et le mot de passe (non crypté)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Entrer le mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Identifiant"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "URL de base du serveur OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Nom d'utilisateur (e-mail) du compte OSM."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9814,17 +10113,17 @@
 "aucun mot de passe."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "URL du serveur de base"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "Nom d'utilisateur OSM (e-mail))"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "Mot de passe OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9934,5 +10233,5 @@
 msgstr "Le fichier \"{0}\" n'existe pas"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9941,38 +10240,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9980,19 +10279,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Champ <member> incomplet avec ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "L’objet avec l’id=0 est illégal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -10001,7 +10300,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -10011,25 +10314,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -10037,5 +10340,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -10044,5 +10347,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -10050,5 +10353,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -10057,13 +10360,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Préparation des données de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -10074,14 +10377,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Téléchargement depuis OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr "Téléchargement des chemins référents ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -10194,15 +10496,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Mise à jour des greffons"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Télécharger les greffons"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10215,29 +10517,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "{0} greffon téléchargé avec succès. Veuillez redémarrer JOSM."
 msgstr[1] "{0} greffons téléchargé avec succès. Veuillez redémarrer JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Téléchargement du greffon {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Annuler le téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Télécharger le greffon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Annuler le téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10249,10 +10555,10 @@
 msgstr "Une erreur est survenue dans le greffon {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10262,50 +10568,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "La dernière mise à jour du greffon date de plus de {0} jours."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Mise à jour des greffons"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Greffon non trouvé : {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "La dernière mise à jour du greffon date de plus de {0} jours."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Vous pouvez changer le nombre de jours au bout duquel cet avertissement "
-"s'affiche<br>en modifiant l'option de configuration 'pluginmanager."
-"warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Impossible de charger le greffon {0}. Le supprimer des préférences ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Désactiver le greffon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Garder le greffon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10315,9 +10629,9 @@
 "l’autorisation de remplacer les greffons existants."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10326,10 +10640,10 @@
 "Une exception inattendue pouvant provenir du greffon \"{0}\" s’est produite."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "D’après les informations du greffon, l’auteur est {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10338,9 +10652,9 @@
 "d'extension avant de rapporter un bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Ce module d'extension doit-il être désactivé ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10350,23 +10664,23 @@
 "greffon ne soit plus chargé."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 "Le greffon ne peut pas être supprimé. Il était probablement déjà désactivé."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Informations sur le greffon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "Aucune description disponible"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Plus de détails"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10375,18 +10689,18 @@
 msgstr[1] "La liste des geffons a été obtenue à partir de {0} sites."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Pas d'information sur les greffons trouvée."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Le plugin {0} n'est pas disponible. Mise à jour annulée."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Tous les greffons installés sont à jour."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10399,9 +10713,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Télécharger les greffons manquants"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10416,9 +10730,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10440,19 +10754,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Greffon intégré à JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10519,5 +10833,5 @@
 msgstr "(Ce texte a déjà été copié dans votre presse-papier.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10526,5 +10840,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10533,5 +10847,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10541,5 +10855,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10552,10 +10866,10 @@
 "d’erreur est :<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10564,5 +10878,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10571,16 +10885,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10590,5 +10904,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10599,5 +10913,5 @@
 "votre connexion internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10606,5 +10920,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10616,10 +10930,10 @@
 "tard.</html>"
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10628,10 +10942,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10642,5 +10956,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10650,5 +10964,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10659,5 +10973,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10764,14 +11078,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
-msgstr ""
-
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
-msgstr "Créer un reseau de voies"
+msgstr "Créer un réseau de voies"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -10793,5 +11100,5 @@
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104
 msgid "Create a grid of ways"
-msgstr "Créer un reseau de voies"
+msgstr "Créer un réseau de voies"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59
@@ -10919,5 +11226,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -10933,10 +11241,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Impair"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10944,103 +11252,103 @@
 msgstr "Pair"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -11094,46 +11402,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extractions des positions GPS depuis les informations EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Début du parcours du dossier"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Un des fichiers sélectionnés était vide !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Lexture des images..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Impossible d’obtenir le chemin canonique du dossier {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Parcours du dossier {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fichier vide trouvé dans le dossier {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Erreur lors de la récupération des fichiers du dossier {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Corréler en GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11402,5 +11711,5 @@
 msgstr "Erreur sur le fichier {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11416,10 +11725,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr "Sélectionner la feuille cadastrale."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11469,13 +11778,13 @@
 msgstr "Choisir parmi..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Enregistrement automatique de la source"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11489,13 +11798,13 @@
 "Voulez-vous réaffecter la touche F11 au téléchargement du cadastre ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr "Restaurer la fontion de téléchargement à la touche F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM est arreté pour que la modification prenne effet."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11621,7 +11930,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Afficher les coordonnées en"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11641,5 +11949,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11655,5 +11963,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
 msgid "Create buildings"
-msgstr "Créer les bêtiments"
+msgstr "Créer les bâtiments"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264
@@ -11682,13 +11990,13 @@
 msgstr "Créer la frontière"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr "Contact du serveur WMS du cadastre…"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr "L'image a déjà été chargée."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11823,22 +12131,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Changer de lieu"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Définir un nouveau lieu pour la prochaine requête"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Ajouter un nouveau calque"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Localisation"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11848,5 +12156,5 @@
 "ponctuation disponible sur www.cadastre.gouv.fr .</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Ajouter un nouveau calque"
@@ -11860,9 +12168,9 @@
 msgstr "Obtenir un nouveaucooki (session espirée)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11885,5 +12193,5 @@
 msgstr "Ajuster la position de la couche WMS (images raster uniquement)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11907,5 +12215,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Calque vide"
@@ -11934,5 +12242,5 @@
 msgstr "Zone de délimitation de la commune : {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11943,9 +12251,9 @@
 "Veuillez en créer un nouveau."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Erreur de format du tampon"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11954,9 +12262,9 @@
 "courante"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Erreur de tampon de zone Lambert"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -12054,5 +12362,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Aucune donnée chargée"
@@ -12464,7 +12772,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "eau"
@@ -12649,5 +12957,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsData.java:130
 msgid "no name"
-msgstr ""
+msgstr "aucun nom"
 
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
@@ -12680,11 +12988,11 @@
 msgstr "Calque instrument LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Capturer la trace GPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
@@ -12692,22 +13000,22 @@
 "LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Centrer une fois"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centrer le calque LiveGPS sur la position actuelle."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Centrage automatique"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centrer continuellement le calque LiveGPS sur la position actuelle."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12786,5 +13094,5 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:92
 msgid "Unable to order the ways. Please verify their directions"
-msgstr ""
+msgstr "Impossible d’ordonner les chemins. Merci de vérifier leur direction."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:106
@@ -12798,24 +13106,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr "Créer multipolygones"
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
-msgstr "Créer multipolygones"
-
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+msgstr "Créer multipolygones."
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12973,4 +13281,9 @@
 msgstr "Exécutable Firefox"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Calque"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12979,5 +13292,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "create new objects"
-msgstr "créer"
+msgstr "créer de nouveaux objets"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -13020,30 +13333,30 @@
 msgstr "Actions permises"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Il a été demandé à Remote Control de charger les données depuis l'API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Request details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Voulez-vous permettre celà?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Confirmer l’action Remote Control"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr "Il a été demandé à Remote Control de créer un nouveau nœud."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -13064,7 +13377,5 @@
 msgstr "Aucune relation sélectionnée"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -13073,4 +13384,5 @@
 #: ../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 "Calcul d'itinéraire"
@@ -13092,25 +13404,25 @@
 msgstr "Ouvrir une liste des nœuds de routage"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
 msgstr "Ajoute un calque de routage"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Critère"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "Le plus court"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "Le plus rapide"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Inverser l'itinéraire"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Suprimer l'itinéraire"
@@ -13140,93 +13452,87 @@
 msgstr "Entrez les valeurs du poids"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Carte glissante"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Zoom automatique : "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Charger la tuile"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "Montrer le status de la dalle"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Demander une mise à jour"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Afficher les informations"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Charger toutes les dalles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Augmenter le zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Diminuer le zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr "Réinitialiser la mémoire tampon des tuiles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "image "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "chargement automatique des tuiles"
 
 #. 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Paramètres du greffon SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Sources des dalles"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Zoom automatique : "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Chargement automatique des tuiles : "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Niveau de zoom maxi. : "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Niveau de zoom maxi. : "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Pâlissement  graduel de l'arrière plan : "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "Erreur lors du chargement des metadata"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "demandé : {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "Error lors de la mise à jour"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -13239,5 +13545,5 @@
 msgstr "Sauvegarder les données capturées vers un fichier à chaque minute"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13404,5 +13710,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nom de la rue"
@@ -13450,30 +13756,30 @@
 msgstr "Veuillez sélectionner au moins un chemin clos devant être fusionné."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "Pas d’intersection trouvée. Rien n’a été modifié."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Noeuds ajoutés sur toutes les intersections"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 "Supprimer les chemins qui ne font pas partie d'un multipolygone intérieur"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Corriger les relations"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Ai fusionné une aire superposée sur elle même"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Ai fusionné des aires superposées"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13483,33 +13789,33 @@
 "Veuillez vérifier qu'aucune erreur n'a été introduite."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Entrer des valeurs pour tous les conflits."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Résoudre les conflits"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Corriger les conflits d’attribut"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Élément supprimé des relations"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Aires jointes: enlever les voies courtes"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Chemin fermé"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Supprime les attributs des chemins internes"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Fonction de jointure des zones"
@@ -13724,8 +14030,4 @@
 msgstr "Résoudre l'erreur sélectionné"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignorer"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13770,25 +14072,24 @@
 msgstr "Remplacer \"{0}\" par \"{1}\" pour"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Lignes de côte"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Ce test vérifie si les lignes de côte sont correctes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
-msgstr "Ligne de côte désordonnée"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Ligne de côte désordonnée"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+msgid "Unconnceted coastline"
+msgstr "Littoral non connecté"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Ligne de côte désordonnée"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr "Littoral inversé"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13812,19 +14113,19 @@
 msgstr "Chemins se croisant"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Nœuds dupliqués"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 "Ce test vérifie si des nœuds ne sont pas exactement à la même position."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Nœuds à la même position"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Confirmation"
@@ -14082,4 +14383,8 @@
 msgstr "Modifier la source sélectionnée."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Supprimer la source sélectionnée de la liste."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14298,7 +14603,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "bâtiment"
@@ -14312,5 +14617,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "zone"
@@ -14320,26 +14625,26 @@
 msgstr "Chemin non fermé"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Chemins non liés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Ce test vérifie si un chemin a son dernier point très près d’un autre chemin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Fin d’un chemin près d’une autre route"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Fin d’un chemin près d’une autre chemin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Nœud d’un chemin à côté d’un autre chemin"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "point final d’un chemin connecté à côté d’un autre chemin"
@@ -14439,22 +14744,26 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
-#, fuzzy
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "Calque WMS ({0}), téléchargement au zoom {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr "Walking Papers: {0}"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "Sélectionner le nœud de départ à la fin d'un chemin"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "Fin de la ligne atteinte"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "Intersection atteinte"
@@ -14607,4 +14916,6 @@
 "or a trailing '?'."
 msgstr ""
+"Attention : l’adresse du service WMS « {0} » ne se finit ni par « & », ni par "
+"« ? »."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
@@ -14638,4 +14949,5 @@
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
+"Attention : couche WMS désactivée à cause d’une adresse malformée « {0} »"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
@@ -14720,9 +15032,9 @@
 msgstr "Erreur de format de fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Ouvrir un calque WMS vide pour charger des données depuis un fichier"
@@ -14868,5 +15180,5 @@
 #: build/trans_plugins.java:11
 msgid "Create a grid of ways."
-msgstr "Créer un reseau de voies"
+msgstr "Créer un réseau de voies"
 
 #. Plugin czechaddress
@@ -15074,5 +15386,5 @@
 #: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
-msgstr "Crée des maisons mytoyennes depuis des blocs entiers."
+msgstr "Crée des maisons mitoyennes depuis des blocs entiers."
 
 #. Plugin utilsplugin
@@ -15224,6 +15536,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Référence"
@@ -15785,5 +16097,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr "Métal"
@@ -15795,5 +16107,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "bois"
@@ -16081,7 +16393,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "oui"
@@ -16230,8 +16542,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "non"
@@ -16358,31 +16670,4 @@
 msgstr "Éditer une jonction"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Type"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16503,5 +16788,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "residential"
@@ -16536,5 +16821,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "service"
@@ -16569,5 +16854,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "construction"
@@ -16957,12 +17242,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Compagnie"
@@ -17175,6 +17460,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Altitude"
@@ -17601,5 +17886,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "marais"
@@ -18132,25 +18417,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
@@ -18216,24 +18501,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr "24h/24 7j/7"
@@ -18246,24 +18531,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lun-ven 08:30-20:00"
@@ -18276,24 +18561,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Mar-dim 08:00-15:00; Sam 08:00-12:00"
@@ -18326,6 +18611,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Numéro de référence"
@@ -18341,5 +18626,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "souterrain"
@@ -18353,5 +18638,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Péage/Forfait"
@@ -18587,5 +18872,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Abri"
@@ -19053,5 +19338,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cyclisme"
@@ -19066,5 +19351,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Ski"
@@ -19218,16 +19503,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Site archéologique"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Éditer un site archéologique"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument commémoratif"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Editez un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Mémorial"
@@ -19235,55 +19533,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Éditer un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Éditer une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Éditer une Chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Éditer Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Éditer un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Aire de jeux"
@@ -19291,35 +19589,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Éditer une zone de jeu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Éditer un lieu de pêche"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stade"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Éditer un stade"
@@ -19333,6 +19631,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "Selectionner un sport:"
@@ -19724,30 +20022,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "sport"
@@ -19757,227 +20055,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "tir à l'arc"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "boules"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "canoë"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "cricket_nets"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "dog_racing"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "équitation"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "moteur"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelote"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "chasse"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skate"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Éditer un centre sportif"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Éditer un terrain de sport"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Éditer un circuit"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Parcours de Golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Éditer un terrain de golf"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Éditer un minigolf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Editer Multi"
+
+#. 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 "type"
 
 #. item "Sport/Multi" combo "type"
@@ -20014,203 +20365,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "Terrain"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "sports_centre"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadium"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "№piste"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Éditer un Bowling"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Éditer athlétisme"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Éditer tir à l’arc"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Éditer escalade"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Éditer canoë"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Éditer cyclisme"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Éditer course de chiens"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Equitation"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Éditer sports équestres"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Éditer course de chevaux"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Éditer gymnastique"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Sports mécaniques"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Éditer sports mécaniques"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skate"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Éditer patin à roulettes"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Éditer skateboard"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Natation"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Éditer natation"
@@ -20218,56 +20569,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Type de piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "de descente"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "intermédiaire"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "avancé"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Tirer"
@@ -20275,182 +20626,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Éditer tir sportif"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sport de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Éditer football australien"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Éditer baseball"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Éditer basketball"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Editer un Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boules"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Éditer boules"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Boules"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Éditer bowls"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Éditer cricket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Éditer filets de cricket"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Éditer croquet"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Éditer hockey"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Éditer pelote basque"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Sports de raquette"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Éditer sports de raquette"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Éditer rugby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Éditer tennis de table"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Éditer tennis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Artificiel"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Bâtiments"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Bâtiment"
@@ -20458,5 +20809,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Bâtiment officiel"
@@ -20464,10 +20815,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Éditer un bâtiment officiel"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Mairie"
@@ -20475,10 +20826,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Éditer une mairie"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambassade"
@@ -20486,10 +20837,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Editer une ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -20498,10 +20849,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Éditer un palais de justice"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Prison"
@@ -20510,10 +20861,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Éditer une prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Poste de police"
@@ -20523,10 +20874,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Éditer un poste de police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -20535,10 +20886,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Éditer une caserne de pompiers"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -20546,5 +20897,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Éditer un bureau de poste"
@@ -20552,15 +20903,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Éditer un jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "École"
@@ -20568,10 +20919,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Éditer une école"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Université"
@@ -20579,10 +20930,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Éditer une université"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -20590,5 +20941,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Éditer un établissement d’enseignement supérieur"
@@ -20596,5 +20947,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cinema"
@@ -20603,10 +20954,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Éditer un cinéma"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliothèque"
@@ -20615,9 +20966,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Éditer une bibliothèque"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -20625,10 +20976,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Éditer un centre artistique"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Théâtre"
@@ -20637,10 +20988,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Éditer un théatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -20650,5 +21001,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Éditer un lieu de culte"
@@ -20657,6 +21008,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religion"
@@ -20665,66 +21016,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "unitarisme"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Dénomination"
@@ -20733,81 +21084,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "catholique"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresses"
@@ -20816,5 +21167,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Editez l'adresse"
@@ -20822,5 +21173,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Numéro du bâtiment"
@@ -20828,20 +21179,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nom de la maison"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nom de la ville"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Code postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Indicatif du pays"
@@ -20850,5 +21201,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Éditer l’interpolation d’adresse"
@@ -20856,61 +21207,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Schéma de numérotation"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "pair"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "impair"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alphabétique"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Usine"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Éditer une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Structure de hauteur"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Éditer une structure de hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Type de pylône"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Hauteur (mètres)"
@@ -20918,25 +21269,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Éditer un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Éditer un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Phare"
@@ -20944,10 +21295,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Éditer un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -20955,10 +21306,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Éditer un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Canalisation"
@@ -20967,37 +21318,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Éditer une canalisation"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "pétrole"
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gaz"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "égouts"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "chaleur"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "toute substance"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "sous l'eau"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "aérien"
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -21007,10 +21358,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Éditer une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Grue"
@@ -21018,10 +21369,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Éditer une grue permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Balise signalétique"
@@ -21029,10 +21380,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Editer balise signalétique"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -21040,10 +21391,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Éditer un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -21051,5 +21402,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Éditer une caméra de surveillance"
@@ -21057,5 +21408,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -21065,35 +21416,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Éditer une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "photovoltaïque"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Station électrique"
@@ -21102,10 +21453,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Editez une station électrique"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -21114,5 +21465,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Modifier transformateur électrique"
@@ -21120,10 +21471,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Champ de vision"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -21134,23 +21485,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Éditer un pylône électrique"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr "pylônes"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr "Référence du pylône"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Ligne haute tension"
@@ -21159,75 +21510,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Editer une ligne haute tension"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr "Type de ligne"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr "ligne"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr "ligne mineure"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Tension"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Nombre de conducteurs par câbles"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr "simple"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr "quadruple"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Toilettes"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Téléphone"
@@ -21236,5 +21587,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Éditer un téléphone"
@@ -21242,5 +21593,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Pièces"
@@ -21248,5 +21599,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Billets"
@@ -21254,5 +21605,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Cartes de crédit temporaire"
@@ -21260,5 +21611,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -21266,15 +21617,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Cartes de crédits"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Recyclage"
@@ -21283,5 +21634,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Éditer un point de recylcage"
@@ -21289,35 +21640,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Canettes"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Vêtements"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Ferrailleur"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Banc"
@@ -21326,31 +21677,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr "Accoudoir"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
-msgstr ""
+msgstr "Matériau"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr "pierre"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr "plastique"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr "Couleur"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr "noir"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr "marron"
@@ -21421,40 +21772,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "espace vert"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr "rouge"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr "bleu"
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "herbe"
-
-#: build/trans_presets.java:2470
+msgstr "gris"
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr "blanc"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr "Nombre de places"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
@@ -21463,30 +21813,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "à moitié"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "complet"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Masquer"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Fontaine"
@@ -21495,10 +21845,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Éditer une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Eau potable"
@@ -21507,10 +21857,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Éditer un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Tour d’abandon (nouveau né)"
@@ -21518,33 +21868,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Éditer un tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Magasins"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Éditer un supermarché"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr "Droguerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr "Éditer la droguerie"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Commerce de proximité"
@@ -21552,9 +21902,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Éditer une épicerie"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -21562,27 +21912,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Éditer un kiosque à journaux"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr "Librairie"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr "Éditer librairie"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "Agence de voyage"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "Éditer agence de voyage"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -21590,5 +21940,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Éditer un distributeur automatique"
@@ -21596,88 +21946,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Boucherie"
@@ -21685,9 +22035,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Éditer une boucherie"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Boulanger"
@@ -21695,9 +22045,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Éditer une boulangerie"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Fleuriste"
@@ -21705,18 +22055,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Modifier fleuriste"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Boutique bio"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Modifier boutique bio"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Alcool"
@@ -21724,54 +22074,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Modifier commerce d'acool"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Boissons"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Modifier débit de boissons"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Informatique"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Modifier magasin informatique"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Électronique"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Modifier magasin d’électronique"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Modifier boutique Hi-Fi"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Ameublement"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Modifier magasin d’ameublement"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Jardinerie"
@@ -21779,9 +22129,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Modifier jardinerie"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Quincaillerie"
@@ -21789,9 +22139,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Modifier quincaillerie"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Magasin de bricolage"
@@ -21799,54 +22149,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Éditer un magasin de bricolage"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Papeterie"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Modifier papeterie"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Coiffeur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Editez un Coiffeur"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Magasin de chaussures"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Modifier magasin de chaussures"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Jouets"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Modifier magasin de jouets"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Vidéoclub"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Modifier vidéoclub"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Pressing"
@@ -21854,9 +22204,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Éditer un pressing"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Laverie libre-service"
@@ -21864,9 +22214,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Éditer une laverie"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Magasin de sports d’extérieur"
@@ -21874,28 +22224,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Éditer un magasin de sports d’extérieur"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Modifier magasin de sport"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Opticien"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Modifier opticien"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Banque"
@@ -21903,14 +22253,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Editez une banque"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -21918,5 +22268,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Éditer un bureau de change"
@@ -21924,15 +22274,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Éditer un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Médecin"
@@ -21940,18 +22290,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Modifier Médecin"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Dentiste"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Editez le Dentiste"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -21959,5 +22309,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Éditer pharmacie"
@@ -21965,9 +22315,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Dispensaire"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Hôpital"
@@ -21975,10 +22325,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Éditer hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -21987,5 +22337,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Éditer point d’accès d’urgence"
@@ -21994,20 +22344,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890"
@@ -22015,5 +22365,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Vétérinaire"
@@ -22022,59 +22372,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Editez un Vétérinaire"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr "Géographie"
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Lieux/endroits"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Éditer un continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Pays"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Éditer un pays"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Département"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Éditer un état"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Région"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Éditer une région"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Éditer un comté/canton"
@@ -22082,15 +22437,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Editez la ville"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Ville 10 000 à 100 000 habitants"
@@ -22098,10 +22453,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Editez la ville"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Banlieue"
@@ -22109,25 +22464,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Éditer une banlieue"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Éditer un village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Éditer un hameau"
@@ -22135,5 +22490,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -22141,10 +22496,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Éditer un lieu-dit"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "île"
@@ -22152,10 +22507,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Éditer une île"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr "îlot"
@@ -22163,5 +22518,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr "Éditer l'îlot"
@@ -22169,5 +22524,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -22175,10 +22530,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Éditer une entrée de grotte"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Sommet"
@@ -22186,10 +22541,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Modifier un pic"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Glacier"
@@ -22197,10 +22552,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Éditer un glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Volcan"
@@ -22208,70 +22563,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Éditer un volcan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Nationale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Éditer une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Éditer une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Éditer une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Politique"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Éditer une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Parc national"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Éditer les frontières d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Arbre"
@@ -22280,15 +22635,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Éditer un arbre isolé"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Bois"
@@ -22297,5 +22652,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Éditer un bois"
@@ -22303,17 +22658,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Forêt"
@@ -22322,14 +22677,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Éditer une forêt"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Éditer une réserve naturelle"
@@ -22337,25 +22692,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Zone d’éboulements"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Éditer une zone d’éboulements"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Broussailles"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Éditer des broussailles"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Talus"
@@ -22363,10 +22718,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Éditer un talus"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Lande"
@@ -22374,5 +22729,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Éditer une lande"
@@ -22380,5 +22735,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Bâtiments de ferme"
@@ -22387,45 +22742,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Éditer des bâtiments de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Terrains de ferme"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Éditer des terrains de ferme"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Editer prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Éditer une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Éditer des jardins familiaux"
@@ -22433,25 +22788,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Jardin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Éditer un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Herbe"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Éditer de l’herbe"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Zone publique herborée"
@@ -22459,10 +22814,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Éditer une zone publique herborée"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Espace commun"
@@ -22470,20 +22825,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Éditer un espace commun"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Parc"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Editez un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -22491,5 +22846,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Éditer une aire de jeux"
@@ -22497,15 +22852,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Éditer une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -22513,9 +22868,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Éditer un petit cimetière"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -22523,39 +22878,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Éditer un cimetière"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Zone commerciale"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Éditer une zone commerciale"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Bureaux"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Éditer des bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Éditer une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -22563,15 +22918,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Éditer une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Militaire"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Éditer un terrain militaire"
@@ -22579,55 +22934,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Zone de construction"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Éditer un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Terrain en friche"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Éditer un terrain en friche"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Espace vert"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Éditer une nouvelle zone de construction"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Éditer une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Éditer une carrière"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multypoligone"
@@ -22637,5 +22992,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -22644,10 +22999,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "segment extérieur"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -22655,5 +23010,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -22662,5 +23017,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -22668,34 +23023,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "Interdiction d'aller tout droit"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "Obligation d'aller tout droit"
@@ -22704,15 +23059,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "chemin d'origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "nœud ou chemin de passage"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "chemin destination"
@@ -22720,5 +23075,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Route"
@@ -22727,5 +23082,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Modifier une route"
@@ -22733,5 +23088,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Type de route"
@@ -22803,5 +23158,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22810,17 +23165,17 @@
 msgstr "vélo/bicyclette"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "ski"
@@ -22873,5 +23228,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22880,13 +23235,13 @@
 msgstr "piéton"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "randonnée"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "détour"
@@ -22900,10 +23255,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Description du symbole"
@@ -22911,31 +23266,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr "État de la route"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Couleur (hexa)"
@@ -22944,30 +23299,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "segment de route"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "point d'arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "point d'arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "point d'arrêt précédent"
@@ -23405,11 +23760,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "déprécié"
@@ -25433,5 +25788,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "eau (claire)"
@@ -26103,4 +26458,12 @@
 #.
 #. <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"/>
@@ -26125,5 +26488,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "patrimoine"
@@ -26137,5 +26500,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "carrière"
@@ -26149,5 +26512,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "décharge"
@@ -26169,5 +26532,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "bassin"
@@ -26181,5 +26544,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "forêt"
@@ -26193,5 +26556,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "bâtiments de ferme"
@@ -26214,5 +26577,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "commerce de proximité"
@@ -26226,5 +26589,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "zone industrielle"
@@ -26238,5 +26601,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "terrain en friche"
@@ -26250,5 +26613,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "espace vert"
@@ -26262,5 +26625,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "zone ferroviaire"
@@ -26317,7 +26680,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "zone militaire"
@@ -26331,5 +26694,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "cimetière"
@@ -26342,5 +26705,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "sommet"
@@ -26355,5 +26718,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "glacier"
@@ -26367,5 +26730,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "volcan"
@@ -26420,8 +26783,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "nature"
@@ -26435,5 +26798,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "broussailles"
@@ -26447,5 +26810,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "lande/bruyère"
@@ -26459,8 +26822,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "zone"
+msgstr "Zone de forêt"
 
 #. color water
@@ -26472,5 +26834,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "terrain boueux/vase"
@@ -26484,5 +26846,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "plage"
@@ -26560,8 +26922,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "route"
@@ -26609,7 +26971,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "frontière"
@@ -26759,11 +27121,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "lieu"
@@ -26811,6 +27173,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "adresse"
@@ -27118,35 +27480,94 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Erreur durant le chargement de la page {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
+#~ msgid "File could not be found."
+#~ msgstr "Impossible de trouver le fichier."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Veuillez sélectionner au moins une tâche à télécharger"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "L’envoi vers l’API OSM a échoué"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Relation conflictuelle"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A> ou <A "
-#~ "HREF=\"{1}\">votre langage</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\" avec le "
+#~ "rôle {2}.<br>Enlever de la relation ?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
 #~ msgstr ""
-#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de "
-#~ "JOSM"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Utiliser la balise \"{0}\""
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ "<html>La sélection \"{0}\" est utilisée par la relation \"{1}\"."
+#~ "<br>Enlever de la relation ?</html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Erreur d’analyse"
+
+#~ msgid "File not found"
+#~ msgstr "Fichier non trouvé"
+
+#~ msgid "Replace"
+#~ msgstr "Remplacer"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Veuillez d’abord saisir les coordonnées désirées."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Sélectionner un marque-page en premier."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Veuillez saisir une chaîne de caractères pour la recherche"
+
+#~ msgid "Cannot read place search results from server"
 #~ msgstr ""
-#~ "Sélectionner manuellement la zone Lambert (i.e. pour les localisations "
-#~ "entre deux zones)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Ouvrir d'abord un calque (GPX, OSM, cache)"
+#~ "Impossible de lire les résultats de recherche du lieu depuis le serveur"
+
+#~ msgid "name"
+#~ msgstr "nom"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Copier les valeurs par défaut"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Veuillez sélectionner la colonne à copier"
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Ajouter une nouvelle source XML à la liste"
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr ""
+#~ "Paramètres par défaut (voir info-bulle pour obtenir des informations "
+#~ "détaillées)"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Vous pouvez changer le nombre de jours au bout duquel cet avertissement "
+#~ "s'affiche<br>en modifiant l'option de configuration 'pluginmanager."
+#~ "warntime'.)"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Montrer le status de la dalle"
+
+#~ msgid "Request Update"
+#~ msgstr "Demander une mise à jour"
+
+#~ msgid "error loading metadata"
+#~ msgstr "Erreur lors du chargement des metadata"
+
+#~ msgid "requested: {0}"
+#~ msgstr "demandé : {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "Error lors de la mise à jour"
 
 #~ msgid "Move"
@@ -27214,4 +27635,7 @@
 #~ msgid "unnamed"
 #~ msgstr "sans-nom"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Erreur durant le chargement de la page {0}"
 
 #~ msgid "Validate"
@@ -27278,4 +27702,9 @@
 #~ msgid "Tags (empty value deletes tag)"
 #~ msgstr "Étiquettes (une valeur vide supprime l’étiquette)"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr ""
+#~ "Les pages d’aide ne peuvent être éditées que depuis l’aide en ligne de "
+#~ "JOSM"
 
 #~ msgid ""
@@ -27560,4 +27989,9 @@
 #~ msgstr "Public"
 
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr ""
+#~ "Sélectionner manuellement la zone Lambert (i.e. pour les localisations "
+#~ "entre deux zones)"
+
 #~ msgid "Select Tableau d'Assemblage"
 #~ msgstr "Sélectionner le tableau d'assemblage"
@@ -27602,7 +28036,4 @@
 #~ msgstr "Commentaire sur cette déposition"
 
-#~ msgid "Aborting..."
-#~ msgstr "Interruption en cours..."
-
 #~ msgid "Unsaved Changes"
 #~ msgstr "Modifications non enregistrées"
@@ -27659,4 +28090,7 @@
 #~ "Erreur interne : impossible de vérifier les conditions pour aucun calque. "
 #~ "Merci de signaler ceci comme une erreur."
+
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Ouvrir d'abord un calque (GPX, OSM, cache)"
 
 #~ msgid "Adjust the position of the WMS layer"
@@ -27721,4 +28155,10 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Modifier une herse"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Utiliser la balise \"{0}\""
 
 #~ msgid "Tagging preset source"
@@ -27843,7 +28283,4 @@
 #~ msgstr "La mise à jour a échoué"
 
-#~ msgid "Keep mine"
-#~ msgstr "Conserver ma version"
-
 #~ msgid "Checking whether primitive {0} is gone ..."
 #~ msgstr "Vérification si la primitive {0} est supprimée..."
@@ -27937,9 +28374,4 @@
 #~ msgstr "Historique de l’objet"
 
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Impossible de charger l’historique depuis le serveur. Détails :<br>"
-#~ "{0}</html>"
-
 #~ msgid "No data"
 #~ msgstr "Aucune donnée"
@@ -27981,7 +28413,4 @@
 #~ "modifications et continuer ?"
 
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Aucun ensemble de changements n'est actuellement ouvert."
-
 #~ msgid "Use a new changeset and close it"
 #~ msgstr "Utiliser un nouvel ensemble de changements et le fermer"
@@ -28023,4 +28452,14 @@
 #~ msgstr "Pas encore décidé."
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A> ou <A "
+#~ "HREF=\"{1}\">votre langage</A>."
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Page d’aide manquante. Créez la sur <A HREF=\"{0}\">English</A>."
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 18273)
+++ applications/editors/josm/i18n/po/gl.po	(revision 18508)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
 "PO-Revision-Date: 2009-09-22 15:04+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Creando Interface (GUI) principal"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Axuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de ficheiro mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Erro"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "DESCOÑECIDO"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Acerca de"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Amosar a pantalla de \"Acerca de\"."
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Último cambio en {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Versión Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Páxina de incio"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Informes de Erro"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Información"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Leeme"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revisión"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Colaboración"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Engadidos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Acerca de JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "O ficheiro non puido ser atopado"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -318,42 +301,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -361,5 +343,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -372,19 +354,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -393,50 +375,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Engadir Nodo..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Engadir un nodo introducindo latitude e lonxitude."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Editar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Introducir as coordenadas para o novo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Usar grados decimais."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valores negativos indican que é o hemisferio Oeste/Sur."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -445,5 +427,5 @@
 msgstr "Latitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -452,27 +434,27 @@
 msgstr "Lonxitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Alinear os nodos en círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Mover os nodos seleccionados a un círculo."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -482,5 +464,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -496,30 +478,28 @@
 msgstr "Ferramenta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Por favor, selecciona polo menos catro nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -529,84 +509,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Alinear os nodos en fila"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Mover os nodos seleccionados a unha liña."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Por favor, selecciona polo menos tres nodos."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "conflito"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Facer zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Facer zoom na vista a {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Vista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Non se seleccionou nada sobre o que facer zoom."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Non hai conflitos sobre os que facer zoom"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -614,37 +594,37 @@
 msgstr "Ficheiro: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Combinar vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Combinar varias vías en unha."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Cambiar direccións?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Invertir e Combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -654,5 +634,5 @@
 "invertir algunhas?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -662,41 +642,41 @@
 "serie de nodos)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona polo menos dúas vías para combinar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Copiar os obxectos seleccionados ó buffer de pegado."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Por favor, selecciona algo para copiar"
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Crear Círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Crear un círculo a partir de tres nodos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -704,16 +684,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -725,5 +703,5 @@
 msgstr "Borrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Borrar obxectos seleccionados."
@@ -731,6 +709,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -744,74 +722,51 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Distribuir Nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr ""
 "Distribuir os nodos seleccionados de xeito equidistante ao longo dunha liña."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Descargar de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Descargar datos do mapa do servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Descargar"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Por favor, selecciona polo menos unha tarefa para descargar"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -820,39 +775,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicar selección copiando e pegando inmediatamente."
@@ -862,41 +817,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Sair"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Sair da aplicación,"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Exportar a GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exportar os datos a un ficheiro GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nada que exportar. Adquire antes algún dato."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -935,6 +890,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -953,9 +908,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -975,5 +930,5 @@
 msgstr "o parámetro \"{0}\" debe non ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -981,36 +936,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Unir Nodo a Vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Unir un nodo ós segmentos de vía máis próximos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Unir Nodo e Liña"
@@ -1020,170 +975,188 @@
 msgstr "Sen Atallo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Acoplar Nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Acoplar nodos no máis antigo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor, selecciona polo menos dous nodos a acoplar."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Abortando..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Non se poden acoplar os nodos: Habería que borrar unha vía que está ainda en "
 "uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Acoplar {0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../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:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Reflexar"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Reflexar os nodos e vías seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Por favor, seleccione como mínimo un nodo ou vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "arriba"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Mover obxectos {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "abaixo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "esquerda"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "dereita"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Mover {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Move Obxectos {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Non se poden mover objectos fora do mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Nova"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Crear un novo mapa."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Abrir un ficheiro."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Abrir Lugar..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Abrir unha URL."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Capa Distinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Introducir URL a descargar:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Descargar Lugar"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Descargar URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Descargando datos"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Ortogonalizar Forma"
@@ -1193,18 +1166,18 @@
 msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1213,9 +1186,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1224,32 +1197,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Ortogonalizar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Pegar contidos ó buffer de pegado."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Pegar Etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
@@ -1257,5 +1231,5 @@
 "seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1264,5 +1238,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1271,59 +1245,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Preferencias..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Abrir unha páxina de preferencias para a configuración global."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Refacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Refacer a última acción desfeita."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Renomear capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Renomear tamén o ficheiro"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Invertir Vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Invertir a dirección de todas as vías seleccionadas."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Por favor, selecciona polo menos unha vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Invertir vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1331,10 +1305,10 @@
 msgstr "Gardar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Gardar os datos actuais."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1385,21 +1359,21 @@
 msgstr "Gardar Capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Gardar os datos actuais nun novo ficheiro."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Seleccionar Todo"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1409,10 +1383,10 @@
 "tamén os obxectos incompletos."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Amosar Informe de Estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1420,19 +1394,19 @@
 "ós erros"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Axda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Informe de Estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Copiar a porta papeis e pechar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1441,18 +1415,18 @@
 msgstr "Pechar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Separar Vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Separar unha vía no nodo seleccionado."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "A selección actual non pode ser usada para a separación."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1460,5 +1434,5 @@
 msgstr[1] "Os nodos seleccionados non están no medio de ningunha vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1474,9 +1448,9 @@
 "selecciona tamén a vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Os nodos seleccionados non comparten a mesma vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1484,10 +1458,10 @@
 msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Debes seleccionar dous ou máis nodos para separar unha vía circular."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1514,61 +1488,61 @@
 msgstr "Separar a vía {0} en {1} partes"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Cambiar Liñas GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Debuxar liñas entre puntos gps sen procesar."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Cambia a configuración global \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Despegar Vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplicar nodos que son usados por múltiples vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Este nodo non está pegado a outra cousa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Ningún destes nodos estan pegados a outra cousa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ningún dos nodos desta vía están pegados a outra cousa."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "A selección actual non pode ser usada para despegar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Seleccionar ou ben:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Un nodo etiquetado, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nodo que está sendo usado por máis dunha vía, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Un nodo que está sendo usado por máis dunha vía e unha destas vías, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1577,5 +1551,5 @@
 "vía, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1584,5 +1558,5 @@
 "vía."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1595,9 +1569,9 @@
 "obterán as súas propias copias e todos os nodos serán seleccionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Despegar Nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1605,80 +1579,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Desfacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Desfacer a última acción."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Deseleccionar Todo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Deseleccionar todos os obxectos."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Deseleccionar Todo (Enfocar)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Deseleccionar Todo (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Debuxar os límites dos datos cargados dende o servidor."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Actualizar Selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Non hai primitivas seleccionadas para actualizar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Selección valeira"
@@ -1690,8 +1665,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1700,5 +1675,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1706,29 +1681,29 @@
 msgstr "Non hai cambios que subir."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algún dato antes."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar o paquete de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1750,11 +1725,11 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1770,5 +1745,5 @@
 "editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1778,23 +1753,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Relación contradictoria"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1805,30 +1779,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
-"Advertencia: cabeceira errónea \"{0}\" non concorda co patrón esperado \"{1}"
-"\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Actualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1837,17 +1800,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Cambiar {0} obxecto"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1866,11 +1843,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Aumentar Zoom"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Reducir Zoom"
@@ -1950,21 +1927,17 @@
 msgstr "Avance máis lento"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Descargando datos GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Datos GPX Descargados"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Datos GPS en bruto"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Descargando datos"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1972,27 +1945,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Datos OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Descarga {0} de {1} ({2} restantes)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Erros durante a descarga"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Nome do usuario"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2004,7 +1988,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Primitivas borradas ou movidas"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Os seguintes erros ocurriron durante a descarga masiva:"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Erros durante a descarga"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Erros durante a descarga"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2026,5 +2025,5 @@
 msgstr "Modo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2054,38 +2053,38 @@
 msgstr "seleccionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Engadir nodo a vía e conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Crear novo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Seleccionar nodo baixo o cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2094,14 +2093,14 @@
 msgstr[1] "Insertar novo nodo en {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 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:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Continuar vía a partir do último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Rematar debuxo."
@@ -2121,5 +2120,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo."
@@ -2131,5 +2130,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar o botón do rato para deter a rotación."
@@ -2191,5 +2190,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2198,5 +2197,5 @@
 "próximo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2208,4 +2207,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zoom"
@@ -2225,5 +2225,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Buscar..."
@@ -2324,20 +2323,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - obxectro có número de nodos indicado"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - todos os obxectos cambiados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - todos os obxectos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - todos os obxectos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - todos os obxectos sen etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2346,5 +2352,5 @@
 "coa expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2353,17 +2359,17 @@
 "expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Usar <b>|</b> ou <b>OR</b> para combinar co operador OU lóxico"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Usar <b>\"</b> para escapar operadores (p.e. se a clave conten : )"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> e <b>)</b> para agrupar expresións"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2373,51 +2379,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Comezar Busca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Non se atoparon coincidencias para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Non se engadiu nada á selección buscando por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Non se eliminou da selección buscando por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Atopadas {0} coincidencias"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2451,26 +2457,40 @@
 "relación"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Faltan argumentos para OR."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Faltan argumentos para NOT."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Esperabase parentese de peche."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Número de parámetros incorrecto para o operador nodes."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Valor incorrecto do operador nodes: {0}. O operador nodes espera un número "
+"de nodos ou un rango, por exemplo nodes:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Número de parámetros incorrecto para o operador nodes."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2481,5 +2501,5 @@
 "de nodos ou un rango, por exemplo nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2574,4 +2594,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2589,8 +2625,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Cambiar {0} obxecto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2671,5 +2707,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2705,4 +2741,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "o parámetro \"{0}\" debe non ser nulo"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2733,29 +2780,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Relación contradictoria"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Borrar da relación"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Separar segmento de vía"
@@ -2763,6 +2787,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2774,5 +2798,5 @@
 "estar usandoos.<br>Queres borralos realmente?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2960,15 +2984,30 @@
 msgstr "Corrección"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "O valor predeterminado é \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Ficheiro de configuración mal formado nas liñas {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2977,5 +3016,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2984,5 +3023,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2991,5 +3030,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2998,5 +3037,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3004,5 +3043,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3011,5 +3050,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3018,5 +3057,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3025,5 +3064,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3032,19 +3071,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferencias almacenadas en {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Non se puideron subir as preferencias. Razón: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Non se puideron cargar as preferencias dende o servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3053,5 +3115,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "DESCOÑECIDO"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3073,20 +3155,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "O"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "E"
@@ -3097,4 +3179,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3162,14 +3258,14 @@
 msgstr "Advertencia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3177,5 +3273,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3202,6 +3298,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3264,113 +3360,113 @@
 msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "A vía de estilo de área non está pechada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "a vía multipoligonal \"{0}\" non está pechada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Membro \"{0}\" borrado na relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vía \"{0}\" con menos de dous puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Atopadas máis de unha vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Atopadas máis de unha vía \"ata\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Atopouse máis de un \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Papel \"{0}\" descoñecido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de membro descoñecido para \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Non se atoparon vias \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Non se atoparon vías \"ata\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Ningún nodo o vía \"vía\" atopados."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Non se atopou o estilo para a restrición {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Intersección entre as vías ''{0}'' e ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "A vía interior ''{0}'' está fóra."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Intersección entre as vías ''{0}'' e ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "A vía interior ''{0}'' está fóra."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3386,11 +3482,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "texto"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3406,5 +3501,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3415,5 +3509,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3442,5 +3535,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "fondo"
@@ -3469,12 +3562,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Zona Lambert (Franza)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Zona Lambert (Franza)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3510,10 +3601,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3542,5 +3633,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "Vía férrea"
@@ -3557,4 +3648,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3570,33 +3663,33 @@
 msgstr[1] "{0} membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Violación de condición previa"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3604,16 +3697,16 @@
 msgstr "Conflito"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Maquina descoñecida"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3626,4 +3719,8 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaxe do día\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+msgid "Click to close the dialog"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3693,74 +3790,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Nome de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "opcións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Amosar esta axuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Argumento de xeometría unix estandar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Descargar a caixa de límites"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Abrir ficheiro (como datos gps en bruto, se é .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 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:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Seleccionar coa busca indicada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Restablecer as preferencias ós valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Establecer o idioma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3769,9 +3866,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3781,25 +3878,25 @@
 "que cargas algo de información antes de --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "En lugar de --download=<límites> debes especificar osm://<límites>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Activando extensións actualizadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Cargando extensións anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Establecendo valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Cargando extensións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3812,11 +3909,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3841,6 +3938,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3941,25 +4038,22 @@
 msgstr "(sen obxecto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "a capa non está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Erro durante a análise"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Ficheiro non atopado"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Non, cancelar a operación"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3983,5 +4077,5 @@
 "non establecido: non establecer esta propiedade nos obxectos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4010,24 +4104,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Cambiar {0} obxecto"
-msgstr[1] "Cambiar {0} obxectos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Borrar obxectos seleccionados."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "borrado"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4039,5 +4130,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4086,5 +4177,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4101,5 +4192,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4299,8 +4390,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4609,6 +4700,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4622,6 +4713,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4679,36 +4770,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4720,5 +4811,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr ""
@@ -4808,4 +4899,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4816,4 +4909,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4827,49 +4921,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "Conservar a miña"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Introducir valores para todos os conflitos."
+
+#: ../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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4906,6 +5034,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4994,10 +5122,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5064,5 +5189,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5108,4 +5234,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5131,6 +5258,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5139,22 +5266,22 @@
 msgstr[1] "Esto cambiará ata {0} obxectos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Un valor vacío borra a clave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Cambiar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5163,70 +5290,74 @@
 msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Por favor, selecciona unha tecla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Por favor selecciona un valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Por favor selecciona os obxectos dos que queres cambiar as propiedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Propiedades dos obxectos seleccionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Engadir Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Editar Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Borrar da relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, 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/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Borrar a clave seleccionada en todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Borrar Propiedades"
@@ -5234,40 +5365,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relacións"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Abrir unha lista con todas as relacións."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relacións: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para a relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Borrar a relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Crear unha nova relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Borrar a relación seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Seleccionar ou ben:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Borrar a relación seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Descargar Membros"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5294,5 +5445,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5304,9 +5455,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Desacoplar o panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5315,5 +5466,5 @@
 "da esquerda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Facer click para minimizar/maximizar o contido do panel"
@@ -5396,5 +5547,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5424,23 +5576,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5449,14 +5601,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5466,9 +5618,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5478,15 +5630,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5494,5 +5646,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5500,20 +5652,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5522,66 +5674,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Mover os membros actualmente seleccionados cara arriba"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Mover os membros seleccionados actualmente cara abaixo"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5590,9 +5742,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5601,41 +5753,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas as vías e nodos incompletos na relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Descargar Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5645,17 +5797,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5666,13 +5818,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5686,14 +5838,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5743,57 +5895,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Por favor, primeiro introduce as coordenadas desexadas."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Crear áreas"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Mover os membros seleccionados actualmente cara abaixo"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Por favor, introduce un nome para o lugar."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Selecciona primeiro un marcador."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Mover os membros actualmente seleccionados cara arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Mover os membros actualmente seleccionados cara arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "lat. min."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "lon. min."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "lat. max."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "lon. max."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5803,27 +5986,79 @@
 "área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Fontes de Datos e Tipos"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Datos OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Separar unha vía no nodo seleccionado."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Datos GPS en bruto"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "A via seleccionada non contén o nodo seleccionado."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Descargar como unha nova capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Área de Descarga"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Descargar"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Borrar a capa seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
 "Área de descarga demasiado grande; probablemente será rexeitada polo servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5831,331 +6066,58 @@
 "servidor"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Mover os membros actualmente seleccionados cara arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Por favor selecciona a fila a editar."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Introduce o nome do lugar a buscar:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Introduce o nome do lugar a buscar:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 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:168
-msgid "Please enter a search string"
-msgstr "Por favor introduce unha cadea de busca"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Non se poden ler resultados de busca de lugar dende o servidor"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Introduce o nome do lugar a buscar:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Lugares"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "nome"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "tipo"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "cerca"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "nivel de zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x dende"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "ata"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y dende"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Buscar..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+msgid "Click to start searching for places"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6513,4 +6475,6 @@
 #. 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" />
@@ -6891,6 +6855,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6956,11 +6921,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6970,6 +6935,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6979,79 +6944,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "cerca"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "nivel de zoom"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x dende"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "ata"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y dende"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7132,4 +7364,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7421,9 +7654,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Obxectos para modificar:"
+msgstr[1] "Obxectos para modificar:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7519,5 +7752,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7547,59 +7789,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Imaxes para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Ler GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Non hai hora para o punto {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Non se puido ler a hora \"{0}\" do punto {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lendo {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Non se atoparon imaxes con marcas de tempo lexibles."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lendo {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Imaxes xeo-etiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Inicio GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Fin GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "delta actual: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "Diferencia de zona horaria: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7607,51 +7849,51 @@
 msgstr[1] "imaxes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} dentro da traza."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Sincronizar reloxo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "imaxes JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "A data no ficheiro \"{0}\" non puido ser analizada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Non hai hora EXIF no ficheiro \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Imaxe"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Introduce a data amosada (mm/dd/yyy HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Zona horaria da unidade GPS (differencia coa foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Sincronizar hora coa da unidade GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "A hora introducida non puido ser analizada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7659,30 +7901,30 @@
 msgstr "punto gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizar debuxo de liñas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usar configuración global."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Debuxar liñas entre puntos para esta capa."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Non debuxar liñas entre puntos para esta capa."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Seleccionar as opcións de liña do debuxo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7690,5 +7932,5 @@
 msgstr "Personalizar Cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7697,5 +7939,5 @@
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7704,43 +7946,43 @@
 msgstr "Escolle unha cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importar Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Ficheiros Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcas de audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importar imaxes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Descrición: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7750,28 +7992,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Lonxitude: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7780,5 +8022,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7787,10 +8029,10 @@
 msgstr[1] "{0} puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7800,11 +8042,11 @@
 "perxudicial.<br>Se desexas subir trazados, mira aqui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7814,29 +8056,29 @@
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Descargar todo o que abarca:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km cad."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7847,13 +8089,9 @@
 "Desexas<br>continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Non hai trazados GPX dispoñibles na capa para asociar ó audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7861,5 +8099,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7869,23 +8107,23 @@
 "correctamente os seus tempos foron omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "fora da área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7894,39 +8132,55 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} borrados.)"
+msgstr[1] " ({0} borrados.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} composto de:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} borrados.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8091,6 +8345,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8105,6 +8357,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8292,5 +8542,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8634,20 +8884,19 @@
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Activar os valores predeterminados incorporadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8662,6 +8911,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Actualizar"
@@ -8814,68 +9062,102 @@
 msgstr "Atallo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
 msgstr "Borrar da lista a fonte seleccionada."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Editar o valor da clave seleccionada para todos os obxectos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Engadir nodo na vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Actualizar a lista de seleccion."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Borrar a relación seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Ordenar o menú de elementos preestablecidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9080,5 +9362,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Máis información acerca desta característica"
@@ -9143,16 +9425,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Grupo de axustes preestablecidos \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Grupo de axustes preestablecidos \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9160,5 +9442,5 @@
 msgstr "Contactando co Servidor OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9269,5 +9551,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Erro de análise: estrutura de documento non válida para documento gpx"
@@ -9495,5 +9777,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9520,5 +9802,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9526,5 +9808,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9537,5 +9819,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9546,33 +9828,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Contrasinal ou nome de usuario incorrectos."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advertencia: O contrasinal transfírese sen encriptar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Gardar usuario e contrasinal (sen encriptar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Introduce Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "A URL base do servidor OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9581,17 +9863,17 @@
 "almacenar ningunha contrasinal."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "URL Base do Servidor"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "Contrasinal OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9688,5 +9970,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9695,38 +9977,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9734,19 +10016,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación incompleta de elemento <member> con ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Obxecto ilegal con id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9755,7 +10037,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9765,25 +10051,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9791,5 +10077,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9798,5 +10084,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9804,5 +10090,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9811,13 +10097,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Preparar os datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9828,14 +10114,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Descargar de OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9948,15 +10233,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Actualizar Engadidos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Descargar Engadidos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9969,29 +10254,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
+msgstr[0] "Engadido actualizado con éxito. Por favor reinicia JOSM."
+msgstr[1] "Engadidos actualizados con éxito. Por favor reinicia JOSM."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10003,10 +10292,10 @@
 msgstr "Ocurriu un erro no engadido {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10016,50 +10305,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "A última actualización de engadidos foi fai máis de {0} días."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Actualizar Engadidos"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "O engadido {0} foi requerida polo engadido {1} pero non se atopou."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Engadido non atopado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "A última actualización de engadidos foi fai máis de {0} días."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Podes cambiar o número de días tras os cales aparecerá esta "
-"advertencia<br>establecendoos coa opción de configuración 'pluginmanager."
-"warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Non se puido cargar o engadido {0}. Borrar das preferencias?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Desactivar engadido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10069,9 +10366,9 @@
 "permisos para sobrescribir os existentes."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10080,10 +10377,10 @@
 "Ocurriu unha excepción inesperada que puido proceder do engadido \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Dacordo coa información contida no engadido, o autor é {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10092,9 +10389,9 @@
 "dun fallo."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Debería ser desactivado o engadido?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10102,22 +10399,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "sen descripción dispoñible"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10126,18 +10423,18 @@
 msgstr[1] "Descargada información de engadidos de {0} sitios"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Non se atopou información de engadidos."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Todos os engadidos instalados estan actualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10150,9 +10447,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Descargar engadidos perdidos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10167,9 +10464,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10191,19 +10488,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versión {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Engadido empaquetado con JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10266,5 +10563,5 @@
 msgstr "(O texto xa foi copiado ao teu portapapeis.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10273,5 +10570,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10280,5 +10577,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10288,5 +10585,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10299,10 +10596,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10311,5 +10608,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10318,16 +10615,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10337,5 +10634,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10344,5 +10641,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10351,5 +10648,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10358,10 +10655,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10370,10 +10667,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10384,5 +10681,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10392,5 +10689,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10401,5 +10698,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10495,11 +10792,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10642,5 +10932,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -10656,10 +10947,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10667,103 +10958,103 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10817,46 +11108,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Un dos ficheiros seleccionados era nulo !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Ler fotos..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Atopouse un ficheiro nulo no directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Erro obtendo ficheiros do directorio {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11108,5 +11400,5 @@
 msgstr "Erro no ficheiro {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11119,10 +11411,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11170,13 +11462,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11185,13 +11477,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11299,7 +11591,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Amosar coordenadas como"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11319,5 +11610,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11358,13 +11649,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11495,22 +11786,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11518,5 +11809,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11530,9 +11821,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11555,5 +11846,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11575,5 +11866,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr ""
@@ -11602,5 +11893,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11611,18 +11902,18 @@
 "Crear unha nova."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11717,5 +12008,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Non se cargaron datos."
@@ -12121,7 +12412,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr ""
@@ -12322,32 +12613,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr ""
@@ -12436,24 +12727,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12597,4 +12888,9 @@
 msgstr ""
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Capas"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12640,30 +12936,30 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
+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:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
+msgid "Confirm Remote Control action"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-msgid "Do you want to allow this?"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-msgid "Confirm Remote Control action"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-msgid "Remote Control has been asked to create a new node."
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12682,7 +12978,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12691,4 +12985,5 @@
 #: ../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 ""
@@ -12710,25 +13005,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12758,92 +13053,85 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Zoom"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+msgid "Show Tile Info"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "nivel de zoom"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
 msgstr ""
 
@@ -12857,5 +13145,5 @@
 msgstr "Gardar os datos capturados a un ficheiro cada minuto."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13017,5 +13305,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr ""
@@ -13059,29 +13347,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13089,33 +13377,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Introducir valores para todos os conflitos."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Resolver Conflitos"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13320,8 +13608,4 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr ""
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13366,23 +13650,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
-msgid "Unconnected coastline"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
+msgid "Unconnceted coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "Invertir e Combinar"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13405,18 +13688,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13659,4 +13942,8 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Borrar da lista a fonte seleccionada."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13872,7 +14159,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr ""
@@ -13886,5 +14173,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr ""
@@ -13894,25 +14181,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr ""
@@ -14004,21 +14291,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14251,9 +14543,9 @@
 msgstr "Erro de Formato de Ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Abrir unha capa WMS en branco para cargar datos dende un ficheiro"
@@ -14699,6 +14991,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr ""
@@ -15260,5 +15552,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15270,5 +15562,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr ""
@@ -15556,7 +15848,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr ""
@@ -15705,8 +15997,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr ""
@@ -15833,31 +16125,4 @@
 msgstr ""
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr ""
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15978,5 +16243,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr ""
@@ -16011,5 +16276,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr ""
@@ -16044,5 +16309,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr ""
@@ -16432,12 +16697,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr ""
@@ -16650,6 +16915,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr ""
@@ -17076,5 +17341,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr ""
@@ -17607,25 +17872,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr ""
@@ -17691,24 +17956,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17721,24 +17986,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17751,24 +18016,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17801,6 +18066,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr ""
@@ -17816,5 +18081,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
@@ -17828,5 +18093,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr ""
@@ -18062,5 +18327,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr ""
@@ -18528,5 +18793,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr ""
@@ -18541,5 +18806,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr ""
@@ -18693,16 +18958,27 @@
 
 #. 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:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr ""
@@ -18710,55 +18986,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr ""
@@ -18766,35 +19042,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr ""
@@ -18808,6 +19084,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr ""
@@ -19199,30 +19475,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr ""
@@ -19232,227 +19508,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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 "tipo"
 
 #. item "Sport/Multi" combo "type"
@@ -19489,203 +19818,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr ""
@@ -19693,56 +20022,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr ""
@@ -19750,182 +20079,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr ""
@@ -19933,5 +20262,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr ""
@@ -19939,10 +20268,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr ""
@@ -19950,10 +20279,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr ""
@@ -19961,10 +20290,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr ""
@@ -19973,10 +20302,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr ""
@@ -19985,10 +20314,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr ""
@@ -19998,10 +20327,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr ""
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr ""
@@ -20010,10 +20339,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr ""
@@ -20021,5 +20350,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr ""
@@ -20027,15 +20356,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr ""
@@ -20043,10 +20372,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr ""
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr ""
@@ -20054,10 +20383,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr ""
@@ -20065,5 +20394,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr ""
@@ -20071,5 +20400,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr ""
@@ -20078,10 +20407,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr ""
@@ -20090,9 +20419,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr ""
@@ -20100,10 +20429,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr ""
@@ -20112,10 +20441,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr ""
@@ -20125,5 +20454,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr ""
@@ -20132,6 +20461,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr ""
@@ -20140,66 +20469,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr ""
@@ -20208,81 +20537,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr ""
@@ -20291,5 +20620,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr ""
@@ -20297,5 +20626,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr ""
@@ -20303,20 +20632,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr ""
@@ -20325,5 +20654,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -20331,61 +20660,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr ""
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20393,25 +20722,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr ""
@@ -20419,10 +20748,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr ""
@@ -20430,10 +20759,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr ""
@@ -20442,37 +20771,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr ""
@@ -20482,10 +20811,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr ""
@@ -20493,10 +20822,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -20504,10 +20833,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -20515,10 +20844,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr ""
@@ -20526,5 +20855,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -20532,5 +20861,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr ""
@@ -20540,35 +20869,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr ""
@@ -20577,10 +20906,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr ""
@@ -20589,5 +20918,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -20595,10 +20924,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr ""
@@ -20609,23 +20938,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr ""
@@ -20634,75 +20963,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr ""
@@ -20711,5 +21040,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr ""
@@ -20717,5 +21046,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr ""
@@ -20723,5 +21052,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr ""
@@ -20729,5 +21058,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20735,5 +21064,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr ""
@@ -20741,15 +21070,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr ""
@@ -20758,5 +21087,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr ""
@@ -20764,35 +21093,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr ""
@@ -20801,31 +21130,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20896,39 +21225,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -20937,30 +21266,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr ""
@@ -20969,10 +21298,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr ""
@@ -20981,10 +21310,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -20992,33 +21321,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr ""
@@ -21026,9 +21355,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr ""
@@ -21036,27 +21365,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr ""
@@ -21064,5 +21393,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr ""
@@ -21070,88 +21399,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr ""
@@ -21159,9 +21488,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr ""
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr ""
@@ -21169,9 +21498,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr ""
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr ""
@@ -21179,18 +21508,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21198,54 +21527,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr ""
@@ -21253,9 +21582,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21263,9 +21592,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -21273,54 +21602,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr ""
@@ -21328,9 +21657,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr ""
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr ""
@@ -21338,9 +21667,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr ""
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr ""
@@ -21348,28 +21677,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr ""
@@ -21377,14 +21706,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr ""
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr ""
@@ -21392,5 +21721,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr ""
@@ -21398,15 +21727,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr ""
@@ -21414,18 +21743,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr ""
@@ -21433,5 +21762,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr ""
@@ -21439,9 +21768,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr ""
@@ -21449,10 +21778,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr ""
@@ -21461,5 +21790,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -21468,20 +21797,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -21489,5 +21818,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr ""
@@ -21496,59 +21825,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Lugares"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr ""
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr ""
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr ""
@@ -21556,15 +21890,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr ""
@@ -21572,10 +21906,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr ""
@@ -21583,25 +21917,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr ""
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr ""
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr ""
@@ -21609,5 +21943,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr ""
@@ -21615,10 +21949,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr ""
@@ -21626,10 +21960,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr ""
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21637,5 +21971,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21643,5 +21977,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr ""
@@ -21649,10 +21983,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr ""
@@ -21660,10 +21994,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr ""
@@ -21671,10 +22005,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr ""
@@ -21682,70 +22016,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr ""
@@ -21754,15 +22088,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr ""
@@ -21771,5 +22105,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr ""
@@ -21777,17 +22111,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr ""
@@ -21796,14 +22130,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -21811,25 +22145,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr ""
@@ -21837,10 +22171,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr ""
@@ -21848,5 +22182,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr ""
@@ -21854,5 +22188,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr ""
@@ -21861,45 +22195,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -21907,25 +22241,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21933,10 +22267,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr ""
@@ -21944,20 +22278,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr ""
@@ -21965,5 +22299,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -21971,15 +22305,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr ""
@@ -21987,9 +22321,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr ""
@@ -21997,39 +22331,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr ""
@@ -22037,15 +22371,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr ""
@@ -22053,55 +22387,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr ""
@@ -22111,5 +22445,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr ""
@@ -22118,10 +22452,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr ""
@@ -22129,5 +22463,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr ""
@@ -22136,5 +22470,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -22142,34 +22476,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr ""
@@ -22178,15 +22512,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr ""
@@ -22194,5 +22528,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22201,5 +22535,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22207,5 +22541,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22277,5 +22611,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22284,17 +22618,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22347,5 +22681,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22354,13 +22688,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr ""
@@ -22374,10 +22708,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr ""
@@ -22385,31 +22719,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr ""
@@ -22418,30 +22752,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22879,11 +23213,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr ""
@@ -24907,5 +25241,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25577,4 +25911,12 @@
 #.
 #. <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"/>
@@ -25599,5 +25941,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr ""
@@ -25611,5 +25953,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr ""
@@ -25623,5 +25965,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr ""
@@ -25643,5 +25985,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr ""
@@ -25655,5 +25997,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr ""
@@ -25667,5 +26009,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr ""
@@ -25688,5 +26030,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr ""
@@ -25700,5 +26042,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr ""
@@ -25712,5 +26054,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25724,5 +26066,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25736,5 +26078,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25791,7 +26133,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr ""
@@ -25805,5 +26147,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr ""
@@ -25816,5 +26158,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr ""
@@ -25829,5 +26171,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr ""
@@ -25841,5 +26183,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr ""
@@ -25894,8 +26236,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr ""
@@ -25909,5 +26251,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr ""
@@ -25921,5 +26263,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr ""
@@ -25933,5 +26275,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3383
 msgid "woodarea"
 msgstr ""
@@ -25945,5 +26287,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr ""
@@ -25957,5 +26299,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr ""
@@ -26033,8 +26375,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr ""
@@ -26082,7 +26424,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr ""
@@ -26232,11 +26574,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr ""
@@ -26284,6 +26626,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr ""
@@ -26591,25 +26933,44 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Erro durante a carga da páxina {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A>."
+#~ msgid "File could not be found."
+#~ msgstr "O ficheiro non puido ser atopado"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Por favor, selecciona polo menos unha tarefa para descargar"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Relación contradictoria"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Erro durante a análise"
+
+#~ msgid "File not found"
+#~ msgstr "Ficheiro non atopado"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Por favor, primeiro introduce as coordenadas desexadas."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Selecciona primeiro un marcador."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Por favor introduce unha cadea de busca"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Non se poden ler resultados de busca de lugar dende o servidor"
+
+#~ msgid "name"
+#~ msgstr "nome"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A> ou <A HREF="
-#~ "\"{1}\">galego</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "So se poden editar páxinas de axuda da Axuda en liña de JOSM"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Usar axuste preestablecido \"{0}\""
+#~ "(Podes cambiar o número de días tras os cales aparecerá esta "
+#~ "advertencia<br>establecendoos coa opción de configuración 'pluginmanager."
+#~ "warntime'.)"
 
 #~ msgid ""
@@ -26626,7 +26987,4 @@
 #~ msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n"
 
-#~ msgid "Aborting..."
-#~ msgstr "Abortando..."
-
 #~ msgid "Unsaved Changes"
 #~ msgstr "Cambios non gardados"
@@ -26688,7 +27046,4 @@
 #~ msgstr "Borrar Capa"
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "Actualizar a lista de seleccion."
-
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Nome de inicio de sesión (correo-e) da conta OSM."
@@ -26715,4 +27070,10 @@
 #~ msgstr "versión final:"
 
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Usar axuste preestablecido \"{0}\""
+
 #~ msgid "Found <nd> element in non-way."
 #~ msgstr "Atopouse un elemento <nd> no que non é unha vía."
@@ -26726,9 +27087,4 @@
 #~ msgid "Ill-formed node id"
 #~ msgstr "ID de nodo mal formada"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "Engadido actualizado con éxito. Por favor reinicia JOSM."
-#~ msgstr[1] "Engadidos actualizados con éxito. Por favor reinicia JOSM."
 
 #~ msgid ""
@@ -26814,4 +27170,10 @@
 #~ msgstr "Historial do Elmento"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "So se poden editar páxinas de axuda da Axuda en liña de JOSM"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Erro durante a carga da páxina {0}"
+
 #~ msgid "Open in Browser"
 #~ msgstr "Abrir nun navegador"
@@ -26871,7 +27233,4 @@
 #~ msgstr "Subir a OSM..."
 
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Os seguintes erros ocurriron durante a descarga masiva:"
-
 #~ msgid "No data imported."
 #~ msgstr "Non se importaron datos."
@@ -26931,7 +27290,4 @@
 #~ msgid "Undeleting relation..."
 #~ msgstr "Desfacendo o borrado da relación.."
-
-#~ msgid "Keep mine"
-#~ msgstr "Conservar a miña"
 
 #~ msgid "Checking whether primitive {0} is gone ..."
@@ -27023,4 +27379,14 @@
 #~ "conxunto de datos"
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Páxina de axuda perdida. Créea en <A HREF=\"{0}\">inglés</A> ou <A HREF="
+#~ "\"{1}\">galego</A>."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valor retornado non esperado. Obtívose {0}"
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 18273)
+++ applications/editors/josm/i18n/po/he.po	(revision 18508)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
 "PO-Revision-Date: 2009-10-17 15:07+0000\n"
 "Last-Translator: Tsvi Mostovicz <ttmost@gmail.com>\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "יוצר ממשקי גרפי ראשי"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "עזרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "אזהרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>אין אפשרות לקרוא קובץ''{0}''.<br>הודעת שגיאה: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "שגיאה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "לא ידוע"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "אודות"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "הצג את מסך האודות."
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java ב OpenStreetMap עורך"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "גירסא {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../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:141
+#: ../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:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "דף הבית"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "דיווחי תקלות"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "מידע"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "קרא אותי"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "מהדורה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "תרומה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "רישיון"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "תוספים"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "אודות JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "לא ניתן למצוא את הקובץ."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -322,42 +305,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -365,5 +347,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -376,19 +358,19 @@
 msgstr "אנא בחר לפחות צומת, דרך, או הקשר אשר כבר הועלו למאגר"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "אנא בחר בשכת היעד"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "בחר שכבת יעד"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "מזג"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -397,50 +379,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "אין שכבות יעד"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "הוסף נקודה..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "הוסף נקודה ע\"י הכנסת קווי אורך ורוחב"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "ערוך: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "הכנס את הקורדינטות של הנקודה החדשה."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "השתמש במעלות עשרוניות."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "ערכים שליליים מציינים חצי כדור מערבי\\דרומי."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -449,5 +431,5 @@
 msgstr "קו רוחב"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -456,27 +438,27 @@
 msgstr "קו אורך"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../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:36
+#: ../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:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -486,5 +468,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -500,30 +482,28 @@
 msgstr "כלי: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../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:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -533,84 +513,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../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:32
+#: ../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:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "נתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "שכבה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "בחירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "התנגשות"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "הורד"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "התקרב אל {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "קרב את התצוגה לכדי {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "תצוגה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "לא נבחר פריט להתקרבות."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "אין התנגשויות להתמקד בהם"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -618,37 +598,37 @@
 msgstr "קובץ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../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:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "שלב מספר דרכים לאחת."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "לשנות כיוונים?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "הפוך כיוון ואחד"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -656,5 +636,5 @@
 msgstr "לא ניתן לשלב את הדרכים בכיווניהם הנוכחיים. האם ברצונך להפוך כמה מהם?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -662,41 +642,41 @@
 msgstr "לא ניתן לשלב דרכים (לא ניתן למזג אותן למחרוזת אחת של צמתים)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "שלב {0} דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "נא בחר לפחות שתי דרכים לשילוב."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "העתק"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "העתק את הפריטים הנבחרים אל חוצץ ההדבקה."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "צור עיגול"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "צור עיגול משלושה צמתים נבחרים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "הצמתים הללו אינם חלק ממעגל. מבטל."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -705,16 +685,14 @@
 "יש לבחור בדיוק שתים או שלוש צמתים או דרך אחת עם בדיוק שתים או שלוש צמתים"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -726,5 +704,5 @@
 msgstr "מחק"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "מחק את הפריטים הנבחרים."
@@ -732,6 +710,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -745,73 +723,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../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:30
+#: ../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:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "הורד מ-OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "הורד נתוני מפה משרת ה-OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "הורד"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "אישור"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "אנא בחר לפחות משימה אחת להורדה"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -820,39 +775,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "נמצאו {0} התנגשויות במהלך היבוא"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "התנגשות במהלך ההורדה"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "שכפל"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "שכפל את הבחירה על ידי העתקה והדבקה מיידית."
@@ -862,41 +817,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "צא מהיישום."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "כל הפורמטים"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "ייצא ל-GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "ייצא נתונים לקובץ GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "אין מה לייצא. השג נתונים תחילה."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -935,6 +890,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -953,9 +908,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -975,5 +930,5 @@
 msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -981,36 +936,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "יצא קובץ GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../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:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../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:29
+#: ../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:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "צרף צומת וקו"
@@ -1020,168 +975,186 @@
 msgstr "ללא קיצור"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "מיזוג צמתים"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "מזג את הצמתים לישנים ביותר."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "אנא בחר לפחות שני צמתים למיזוג."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "מבטל..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "מזג {0} צמתים"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../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:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../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:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "שקף את הנקודות והדרכים הבחורות"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "למעלה"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "הזז פריטים {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "למטה"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "שמאלה"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "ימינה"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "הזז {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "הזז את הפריטים {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "לא ניתן להזיז פריטים אל מחוץ לעולם."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "חדש"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "צור מפה חדשה."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "פתח..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "פתח קובץ."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "פותח קבצים"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "פותח קובץ ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "פתח URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "שכבה נפרדת"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "הזן כתובת להורדה:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "מיקום ההורדה"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "כתובת הורדה"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "מוריד נתונים"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "ישר זוויות צורה"
@@ -1191,18 +1164,18 @@
 msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1211,9 +1184,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1222,36 +1195,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "יישר"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "הדבק"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "הדבק את תכני חוצץ ההדבקה."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../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:32
+#: ../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:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1260,5 +1234,5 @@
 msgstr[1] "מדביק תגים {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1267,59 +1241,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "מאפיינים..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "פתח את עמוד ההעדפות להגדרות כלליות."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "העדפות"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "בצע שוב את הפעולה האחרונה שבוטלה."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "שנה גם את שם הקובץ"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../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/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "הפוך דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "הפוך את הכיוונים של כל הדרכים הנבחרות."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "אנא בחר לפחות דרך אחת."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "הפוך דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1327,10 +1301,10 @@
 msgstr "שמירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "שמור את הנתונים הנוכחיים."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1381,21 +1355,21 @@
 msgstr "שמור שכבה"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "שמור בשם..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "שמור את המידע הנוכחי לקובץ חדש."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "בחר הכל"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1404,28 +1378,28 @@
 "בחר את כל העצמים הבלתי בחורים בשכבת הנתונים. גם עצמים בלתי גמורים ייבחרו."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "הצג דו\"ח מצב"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr "הצג דו\"ח מצב עם מידע שימושי שיכול ליהיות מצורף לבאגים"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "עזרה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "דו\"ח מצב"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "העתק ללוח הגזירים וסגור"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1434,18 +1408,18 @@
 msgstr "סגור"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "פצל דרך"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "פצל דרך בנקודה הבחורה."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "הבחירה הנוכחית אינה יכולה לשמש לפיצול."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1453,5 +1427,5 @@
 msgstr[1] "הנקודות הנבחרות לא נמצאות בתוך אף דרך."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1463,9 +1437,9 @@
 msgstr[1] "יותר מדרך אחת משתמשת בנקודות שבחרת. בחר גם את הדרך."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "הנקודות הבחורות אינן שייכות לאותה דרך."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1473,10 +1447,10 @@
 msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "אתה חייב לבחור שתי נקודות או יותר כדי לפצל דרך מעגלית."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1501,70 +1475,70 @@
 msgstr "פצל דרך {0} ל-{1} חלקים"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../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:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "הפרד דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "שכפל נקודות המשותפות למספר דרכים."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "הנקודה לא מוצמדת לשום דבר אחר."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "אף אחת מהנקודות הללו אינה מוצמדת לשום דבר אחר."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "אף אחת מהנקודות של הדרך הזו אינה מוצמדת לשום דבר אחר."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "הבחירה הנוכחית אינה יכולה לשמש להפרדה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "בחר:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* נקודה אחת המשותפת ליותר מדרך אחת, או"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 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:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 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:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 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:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1574,9 +1548,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "הפרד נקודה"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1584,80 +1558,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "בטל את הפעולה האחרונה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "בטל את כל הבחירות"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "בטל את כל בחירות העצמים"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+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:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "עדכן בחירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "בחירה ריקה"
@@ -1669,8 +1644,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1679,5 +1654,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1685,29 +1660,29 @@
 msgstr "אין שינויים להעלאה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "אין מה להעלות. קבל כמה נתונים תחילה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "סנכרן את כל סט הנתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1721,11 +1696,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1736,5 +1711,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1744,23 +1719,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "פתרון התנגשות"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1771,28 +1745,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "העלאה ל-API של OSM נכשלה"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1801,17 +1766,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "שנה עצם {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1830,11 +1809,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "התקרב"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "התרחק"
@@ -1914,21 +1893,17 @@
 msgstr "הרצה איטית יותר"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "מוריד נתוני GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "הורדו נתוני GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "נתוני GPS גולמיים"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "מוריד נתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1936,27 +1911,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "נתוני OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../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:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "שגיאות במהלך הורדה"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "שם המשתמש."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "התעלם"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1968,7 +1954,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "שגיאות במהלך הורדה"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "שגיאות במהלך הורדה"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1990,5 +1991,5 @@
 msgstr "נקודה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2018,38 +2019,38 @@
 msgstr "נבחר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 msgid "Add node"
 msgstr "הוסף צומת"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "הוסף צומת לדרך וחבר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "יוצר נקודה חדשה."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "בחר את הנקודה שמתחת לסמן."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2058,14 +2059,14 @@
 msgstr[1] "הוסף נקודה חדשה ל-{0} דרכים."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "התחל דרך חדשה מהנקודה האחרונה."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "המשך דרך מהנקודה האחרונה."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "הפסק לצייר."
@@ -2085,5 +2086,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע."
@@ -2094,5 +2095,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "שחרר את סמן העכבר להפסקת ההטייה"
@@ -2154,5 +2155,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2160,5 +2161,5 @@
 "שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2168,4 +2169,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "מיקוד"
@@ -2183,5 +2185,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "חפש..."
@@ -2282,42 +2283,49 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>...-עצמים עם מספר הנקודות הנתון"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b>...- כל העצמים ששונו"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - כל העצמים הבחורים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - כל העצמים הבלתי גמורים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - כל העצמים הלא מתוייגים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 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:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "השתמש ב-<b>(</b> ו <b>)</b> כדי לצרף ביטויים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2327,51 +2335,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "חפש"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "התחל חיפוש"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "לא נמצאה התאמה עבור \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "נמצאו {0} התאמות"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2402,26 +2410,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "חסרים ארגומנטים ל-or."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "חסרים ארגומנטים ל-not."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "ציפיתי לסוגר סוגריים."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "מספר שגוי של פרמטרים עבור פעולה על נקודה."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2430,5 +2450,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2525,4 +2545,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "אישור"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2540,8 +2576,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "שנה עצם {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2622,5 +2658,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2656,4 +2692,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2684,29 +2731,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "יחס מתנגש"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "מחק מיחס"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "פצל קטע דרך"
@@ -2714,6 +2738,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2724,5 +2748,5 @@
 "אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2906,15 +2930,30 @@
 msgstr "תיקון תוויות אוטומטי"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "ערך ברירת המחדל הוא \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "קובץ תצורה לא תקין בשורות {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2923,5 +2962,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2930,5 +2969,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2937,5 +2976,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2944,5 +2983,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2950,5 +2989,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2957,5 +2996,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2964,5 +3003,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2971,5 +3010,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2978,19 +3017,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "מאפיינים נשמרו ב {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "לא יכול להעלות מאפיינים. סיבה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "לא יכול לטעון מאפיינים משרת."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -2999,5 +3061,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "לא ידוע"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3019,20 +3101,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "דרום"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "צפון"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "מערב"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "מזרח"
@@ -3043,4 +3125,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3108,14 +3204,14 @@
 msgstr "אזהרה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3123,5 +3219,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3148,6 +3244,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3207,113 +3303,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "מחק איבר \"{0}\" ביחס."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "הדרך \"{0}\" בת פחות משתי נקודות."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "יותר מ-\"to\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "יותר מ-\"via\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "אף דרך \"from\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "אף דרך \"to\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
-#, java-format
-msgid "No useful role ''{0}'' for Way ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
-#, java-format
-msgid "Non-Way ''{0}'' in multipolygon."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
-#, java-format
-msgid "No outer way for multipolygon ''{0}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "דרך פנימית ''{0}'' נמצאת בחוץ."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
+#, java-format
+msgid "No useful role ''{0}'' for Way ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
+#, java-format
+msgid "Non-Way ''{0}'' in multipolygon."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
+#, java-format
+msgid "No outer way for multipolygon ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3329,11 +3425,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "טקסט"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3349,5 +3444,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3358,5 +3452,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3385,5 +3478,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "רקע"
@@ -3451,10 +3544,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3483,5 +3576,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "מסילת רכבת"
@@ -3498,4 +3591,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3511,33 +3606,33 @@
 msgstr[1] "{0} חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "הפרת תנאי מקדים"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3545,16 +3640,16 @@
 msgstr "התנגשות"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "מארח לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3567,4 +3662,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "מוריד את \"המסר היומי\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "בטל את פתרון ההתנגשות וסגור את הדיאלוג"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3634,74 +3734,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "שם משתמש"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "שימוש"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "אפשרויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "הצג עזרה זו"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "פתח קובץ (כ-gps גולמי, אם gpx.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "בחר עם החיפוש הנתון"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "אפס את המאפיינים לברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "קבע את השפה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3710,9 +3810,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "דוגמאות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3720,25 +3820,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "מפעיל תוספים מעודכנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "טען תוספים מוקדמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "קביעת ברירות מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "טעינת תוספים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3751,11 +3851,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3780,6 +3880,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3880,25 +3980,22 @@
 msgstr "(אין עצם)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "השכבה אינה ברשימה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "שגיאה בעת פיענוח"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "קובץ לא נמצא"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "לא, בטל את הפעולה"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3919,5 +4016,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3946,24 +4043,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "שנה עצם {0}"
-msgstr[1] "שנה {0} עצמים"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "מחק את הפריטים הנבחרים."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "לא נמחק"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "יחס"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -3975,5 +4069,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4022,5 +4116,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4037,5 +4131,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4243,8 +4337,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4551,6 +4645,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4564,6 +4658,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4621,36 +4715,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4662,5 +4756,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "הכל"
@@ -4750,4 +4844,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4758,4 +4854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4769,49 +4866,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "שמור את שלי"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4848,6 +4979,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4934,10 +5065,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5004,5 +5132,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5047,4 +5176,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5070,6 +5200,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5078,22 +5208,22 @@
 msgstr[1] "זה ישנה עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "ערך ריק מוחק את המפתח."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<שונה>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "לשנות ערכים?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5102,69 +5232,73 @@
 msgstr[1] "שנה תכונות של עד {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "נא בחר מפתח"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "נא בחר ערך"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "תכונות\\חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "תכונות לעצמים שנבחרו."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "חבר ב"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "הוסף תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "הוסף מצד מפתח/ערך לכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "ערוך מאפיינים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit the value of the selected key for all objects"
 msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "תכונות: {0} \\ חברויות: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "תכונות \\ חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "שנה יחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "מחק מיחס"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "באמת מחק את הבחירה מהיחס {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "מחק את המפתח הנבחר בכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "מחק מאפיינים"
@@ -5172,40 +5306,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "יחסים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "פתח רשימה של כל היחסים."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "יחסים: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "פתח עורך עבור היחס הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "מחק את היחס הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "צור יחס חדש"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "מחק את היחס הנבחר"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "בחר:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "מחק את היחס הנבחר"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "הורד חברים"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5232,5 +5386,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5242,14 +5396,14 @@
 msgstr "בחירה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "\"שחרר\" את הפאנל"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 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:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל"
@@ -5331,5 +5485,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5359,23 +5514,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5384,14 +5539,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5401,9 +5556,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5413,15 +5568,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5429,5 +5584,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5435,20 +5590,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5457,66 +5612,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "הזז את החברים הנבחרים מעלה"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "הזז מטה את החברים שנבחרו"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5525,9 +5680,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5536,41 +5691,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "הורד חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5580,17 +5735,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5601,13 +5756,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5621,14 +5776,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5678,58 +5833,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "לא מחובר"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "סימניות"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "נא הזן את נקודות הציון הרצויות תחילה."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "צור אזורים"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "הזז מטה את החברים שנבחרו"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "נא הזן שם עבור המיקום."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "בחר סימניה תחילה."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "הזז את החברים הנבחרים מעלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "הזז את החברים הנבחרים מעלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "רוחב מזערי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "אורך מזערי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "רוחב מירבי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "אורך מירבי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5738,356 +5923,136 @@
 "כתובת מ www.openstreetmap.org (אתה יכול להדביק כאן כתובת להורדת האיזור)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "מקורות מידע וסוגים"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "נתוני OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "פצל דרך בנקודה הבחורה."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "נתוני GPS גולמיים"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "הורדה כשכבה חדשה"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "הורדת איזור"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "הורד"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "מחק את השכבה הנבחרת."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "הורדת איזור גדול מידי; כנראה שתדחה ע\"י השרת"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "הורדת איזור בסדר; כנראה שתתקבל ע\"י השרת"
 
-#. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "נא הזן מחרוזת לחיפוש"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "לא יכול לקרוא את תוצאות חיפוש המקום מהשרת"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "הזז את החברים הנבחרים מעלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "נא בחר את השורה לעריכה."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
 msgid "Enter a place name to search for:"
 msgstr "הזן שם מקום לחיפוש:"
 
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "מקומות"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "סוג"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "קרוב"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "מיקוד"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "רמת מיקוד"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x התחלה"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "אל"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y התחלה"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "מספרי משטחים"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "הזן שם מקום לחיפוש:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "חפש..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "כיוון לחיפוש אדמה"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6445,4 +6410,6 @@
 #. 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" />
@@ -6823,6 +6790,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6888,11 +6856,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6902,6 +6870,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6911,79 +6879,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "שם"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "סוג"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "קרוב"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "רמת מיקוד"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x התחלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "אל"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y התחלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "מספרי משטחים"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "משתמש"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7064,4 +7299,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7353,9 +7589,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "פריטים לשינוי:"
+msgstr[1] "פריטים לשינוי:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7451,5 +7687,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7479,59 +7724,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "תמונות עבור {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "קורא GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "אין זמן לנקודה {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "קורא {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "לא נמצאו תמונות עם חותמות זמין קריאות."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "קורא {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "תמונות בעלות גאותגיות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "התחלת GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "סיום GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "הפרש נוכחי: {0}ש'"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "הפרש אזורי הזמן: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7539,51 +7784,51 @@
 msgstr[1] "תמונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} מתוך הרצועה."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "סנכרן שעון"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "תמונות JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "תמונה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "אזור זמן של יחידת GPS (הבדל מתמונה)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "סנכרן את השעה עם יחידת ה-GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "לא ניתן לנתח את הזמן שהוזן."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7591,30 +7836,30 @@
 msgstr "נקודת gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "התאם ציור קו"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "השתמש בהגדרות הגלובליות."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "צייר קווים בין נקודות בשכבה זו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "אל תצייר קווים בין נקודות בשכבה זו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "בחר אפשרויות ציור קו"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7622,5 +7867,5 @@
 msgstr "התאם צבעים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7629,5 +7874,5 @@
 msgstr "ברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7636,43 +7881,43 @@
 msgstr "בחר צבע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "סמנים מנקודות בעלות שם"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "ייבא שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "קובץ שמע (wav.*)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "סמן שמע מ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "ייבא תמונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "שם: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "תיאור: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7682,28 +7927,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "תיאור"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "כתובת"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "אורך: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7712,5 +7957,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7719,10 +7964,10 @@
 msgstr[1] "{0} נקודות דרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "המר לשכבת נתונים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7732,11 +7977,11 @@
 "מסלולים, ראה כאן:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7746,29 +7991,29 @@
 msgstr "המר מ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "הורד הכל עם:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} מטרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "שטח מירבי לבקשה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} קמ\"ר"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7779,13 +8024,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7793,5 +8034,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7801,23 +8042,23 @@
 "באופן הגיוני הושמטו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "שכבת נתונים {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "מחוץ לשטח שהורד"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "גירסה {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7826,39 +8067,55 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} נמחק/ו.)"
+msgstr[1] " ({0} נמחק/ו.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} מורכב מ-:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} נמחק/ו.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "גירסת API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8021,6 +8278,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8035,6 +8290,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8204,5 +8457,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8528,20 +8781,19 @@
 msgstr "שפה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "אפשר ברירות מחדל מובנות"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8556,6 +8808,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "עדכן"
@@ -8706,68 +8957,102 @@
 msgstr "קיצור-דרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "בחר שורה להעתקה"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
 msgstr "מחק את המקור הנבחר מהרשימה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "הוסף שכבה חדשה"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "רענן את רשימת הבחירה."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "ערוך את המקור הנבחר"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8947,5 +9232,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "עוד מידע על הכלי הזה"
@@ -9010,16 +9295,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "מחק {1}{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "סמנים מהמיקום {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9027,5 +9312,5 @@
 msgstr "מתחבר לשרת OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9134,5 +9419,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין."
@@ -9358,5 +9643,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9383,5 +9668,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9389,5 +9674,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9400,5 +9685,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9409,50 +9694,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "סיסמא או שם משתמש שגויים."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "אזהרה: הסיסמא נשלחת בצורה לא מוצפנת."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "שמור את המשתמש והסיסמא (לא מוצפנים)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "הכנס סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "התחברות"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "כתובת שרת הבסיס"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "סיסמת OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9549,5 +9834,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9556,38 +9841,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9595,19 +9880,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "עצם לא חוקי עם id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9616,7 +9901,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9626,25 +9915,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9652,5 +9941,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9659,5 +9948,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9665,5 +9954,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9672,13 +9961,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "מכין נתוני OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9689,14 +9978,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "הורד מ-OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9807,15 +10095,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "עדכן תוספים"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9828,29 +10116,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
+msgstr[0] "{0} תוסף עודכן בהצלחה. נא לאתחל את JOSM."
+msgstr[1] "{0} תוספים עודכנו בהצלחה. נא לאתחל את JOSM."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9862,10 +10154,10 @@
 msgstr "אירעה שגיאה בתוסף {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9875,49 +10167,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "התוסף עודכן לאחרונה לפני {0} ימים."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "עדכן תוספים"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "התוסף {0} דרוש ע\"י התוסף {1} אך אינו נמצא."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "תוסף לא נמצא: {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "התוסף עודכן לאחרונה לפני {0} ימים."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע<br>ע\"י קביעת אפשרות התצורה "
-"'pluginmanager.warntime')."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "לא יכול לטעון את התוסף {0}. למחוק מהמאפיינים?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "נטרל תוסף"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9927,9 +10228,9 @@
 "הקיימים."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9937,19 +10238,19 @@
 msgstr "שגיאה בלתי צפויה אירעה שנובעת כנראה מהתוסף \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "לפי המידע בתוסף, המחבר הוא {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr "נסה לעדכן לגירסא האחרונה של התוסף לפני דיווח על תקלה."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "האם התוסף צריך ליהיות מנוטרל?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9957,22 +10258,22 @@
 msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "אין תיאור זמין"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9981,18 +10282,18 @@
 msgstr[1] "הורד מידע על התוסף מ{0} אתרים"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "מידע על התוסף לא נמצא."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "כל התוספים המותקנים מעודכנים."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10005,9 +10306,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "הורד תוספים חסרים"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10022,9 +10323,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10046,19 +10347,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: גירסא {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "תוסף ארוז עם JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10120,5 +10421,5 @@
 msgstr "(הטקסט כבר הועתק ל-clipboard שלך)."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10127,5 +10428,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10134,5 +10435,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10142,5 +10443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10150,10 +10451,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10162,5 +10463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10169,16 +10470,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10188,5 +10489,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10195,5 +10496,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10202,5 +10503,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10209,10 +10510,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10221,10 +10522,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10235,5 +10536,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10243,5 +10544,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10252,5 +10553,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10352,11 +10653,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10499,5 +10793,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -10513,10 +10808,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10524,103 +10819,103 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10674,46 +10969,47 @@
 "{0} קמ\"ש"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "מחלץ מיקומי GPS מ-EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "מתחיל סריקת ספרייה"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "אחד מהקבצים הנבחרים היה null !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "קורא תמונות..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "לא יכול לקבל נתיב קנוני לתיקייה {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "קורא ספרייה {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "נמצא קובץ null בתיקייה {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -10969,5 +11265,5 @@
 msgstr "שגיאה בקובץ {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -10980,10 +11276,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11031,13 +11327,13 @@
 msgstr "בחר מ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11046,13 +11342,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11160,7 +11456,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "הצג קורדינטות כ"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11178,5 +11473,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11217,13 +11512,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11354,22 +11649,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "שנה מיקום"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "קבע מיקום חדש לבקשה הבאה"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "הוסף שכבה חדשה"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "מיקום"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11377,5 +11672,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11389,9 +11684,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11411,9 +11706,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "התאם את מיקום שכבת WMS"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11435,5 +11729,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "שכבה ריקה"
@@ -11462,5 +11756,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11469,18 +11763,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11575,5 +11869,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "שום נתונים לא נטענו."
@@ -11979,7 +12273,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "מים"
@@ -12183,32 +12477,32 @@
 msgstr "שכבת LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "מרכז פעם אחת"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "מירכוז אוטומטי"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "מרכז את שכבת LiveGPS למיקום הנוכחי באופן רצוף"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr ""
@@ -12297,24 +12591,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12459,4 +12753,9 @@
 msgstr "קובץ הרצת פיירפוקס"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "שכבה"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12504,30 +12803,30 @@
 msgstr "פעולות מורשות"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../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:124
+#: ../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:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "האם אתה רוצה לאשר את זה?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "אשר פעולת שלט רחוק"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "שלט רחוק מבקש לייבא נתונים מה-URL הבא:"
@@ -12546,7 +12845,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12555,4 +12852,5 @@
 #: ../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 ""
@@ -12574,25 +12872,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12622,93 +12920,87 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "מיקוד אוטומטי: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "טען משטח"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
 msgstr "הראה מצב משטח"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "בקש עדכון"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "טען את כל המשטחים"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "הגדל"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "הקטן"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "מיקוד אוטומטי"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "מקורות משטחים"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "מיקוד אוטומטי: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "טען משטחים אוטומטית: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "רמת מיקוד מירבית: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "רמת מיקוד מירבית: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "התבקש: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "שגיאה בבקשת עדכון"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -12721,5 +13013,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12881,5 +13173,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "שם רחוב"
@@ -12923,29 +13215,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -12953,33 +13245,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "הזן ערכים לכל ההתנגשויות."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "פתור התנגשויות"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13186,8 +13478,4 @@
 msgstr "תקן את השגיאות הבחורות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "התעלם"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13232,25 +13520,24 @@
 msgstr "החלף \"{0}\" עם \"{1}\" עבור"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "קווי חוף."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "מבחן זה בודק שקווי חוף נכונים."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "קו חוף"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "קו חוף"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "קו חוף"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13272,18 +13559,18 @@
 msgstr "דרכים חוצות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "נקודות כפולות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13526,4 +13813,8 @@
 msgstr "ערוך את המקור הנבחר"
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "מחק את המקור הנבחר מהרשימה"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13738,7 +14029,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "בניין"
@@ -13752,5 +14043,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "שטח"
@@ -13760,25 +14051,25 @@
 msgstr "דרך לא סגורה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "דרכים לא מחוברות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "נקודת קצה של דרך נמצאת ליד דרך ראשית אחרת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "נקודת קצה של דרך נמצאת ליד דרך אחרת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "נקודת דרך נמצאת ליד דרך אחרת"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "נקודת קצה מחוברת של דרך נמצאת ליד דרך אחרת"
@@ -13870,21 +14161,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14117,9 +14413,9 @@
 msgstr "שגיאה בפורמט קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "פתח שכבת WMS ריקה לטעינת נתונים מקובץ"
@@ -14567,6 +14863,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "התייחסות"
@@ -15128,5 +15424,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15138,5 +15434,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr ""
@@ -15424,7 +15720,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "כן"
@@ -15573,8 +15869,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "לא"
@@ -15701,31 +15997,4 @@
 msgstr "ערוך צומת"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "סוג"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15846,5 +16115,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "מגורים"
@@ -15879,5 +16148,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "שירות"
@@ -15912,5 +16181,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "בנייה"
@@ -16300,12 +16569,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "מפעיל"
@@ -16518,6 +16787,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "הגבהה"
@@ -16944,5 +17213,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "ביצה"
@@ -17475,25 +17744,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "שעות פתיחה"
@@ -17559,24 +17828,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17589,24 +17858,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17619,24 +17888,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17669,6 +17938,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr ""
@@ -17684,5 +17953,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
@@ -17696,5 +17965,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr ""
@@ -17930,5 +18199,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "מקלט"
@@ -18396,5 +18665,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "רכיבה"
@@ -18409,5 +18678,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "סקי"
@@ -18561,16 +18830,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "אתר ארכיאולוגי"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "ערוך אתר ארכיאולוגי"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "אנדרטה"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "ערוך אנדרטה"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "מצבת זיכרון"
@@ -18578,55 +18860,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "ערוך מצבת זיכרון"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "פנאי"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "פארק מים"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "ערוך פארק מים"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "מגרש משחקים"
@@ -18634,35 +18916,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "ערוך מגרש משחקים"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "דייג"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "ערוך דייג"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "מתקני ספורט"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "איצטדיון"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "ערוך איצטדיון"
@@ -18676,6 +18958,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "בחר ענף ספורט:"
@@ -19067,30 +19349,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "ספורט"
@@ -19100,227 +19382,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "מרכז ספורט"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "ערוך מרכז ספורט"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "מסלול מירוצים"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "ערוך מסלול מירוצים"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "מגרש גולף"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "ערוך מגרש גולף"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "מיני-גולף"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "ערוך מיני-גולף"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "ספורט"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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"
@@ -19357,203 +19692,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "אתלטיקה"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "ערוך אתלטיקה"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "קשתות"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "ערוך קשתות"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "טיפוס"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "ערוך טיפוס"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "ערוך רכיבה"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "מירוץ כלבים"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "ערוך מירוץ כלבים"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "מירוץ סוסים"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "ערוך מירוץ סוסים"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "התעמלות"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "ערוך התעמלות"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "ספורט מוטורי"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "ערוך ספורט מוטורי"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "סקייטבורד"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "ערוך סקייטבורד"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "שחייה"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "ערוך שחייה"
@@ -19561,56 +19896,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "ערוך סקי"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "סוג מסלול"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "גלישה במורד"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "פארק שלג"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "קושי"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "מתחילים"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "קל"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "מקצוענים"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "ירי"
@@ -19618,182 +19953,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "ערוך ירי"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "ספורט (משחקי כדור)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "כדורגל"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "ערוך כדורגל"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "כדורגל אמריקאי"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "ערוך כדורגל אמריקאי"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "כדורגל אוסטרלי"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "ערוך כדורגל אוסטרלי"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "כדור בסיס"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "ערוך כדור בסיס"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "כדורסל"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "ערוך כדורסל"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "גולף"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "ערוך גולף"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "מגרש גולף"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "כדורת דשא"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "ערוך כדורת דשא"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "הוקי"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "ערוך הוקי"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "רוגבי"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "ערוך רוגבי"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "טניס שולחן"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "ערוך טניס שולחן"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "טניס"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "ערוך טניס"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "מבנים"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "מבנה"
@@ -19801,5 +20136,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "מבנה ציבור"
@@ -19807,10 +20142,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "ערוך מבנה ציבור"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "בניין העירייה"
@@ -19818,10 +20153,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "ערוך בניין העירייה"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "שגרירות"
@@ -19829,10 +20164,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "ערוך שגרירות"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "בית משפט"
@@ -19841,10 +20176,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "ערוך בית משפט"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "כלא"
@@ -19853,10 +20188,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "ערוך כלא"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "משטרה"
@@ -19866,10 +20201,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "ערוך משטרה"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "תחנת מכבי אש"
@@ -19878,10 +20213,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "ערוך תחנת מכבי אש"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "דואר"
@@ -19889,5 +20224,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "ערוך דואר"
@@ -19895,15 +20230,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "ערוך גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "בית ספר"
@@ -19911,10 +20246,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "ערוך בית ספר"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "אוניברסיטה"
@@ -19922,10 +20257,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "ערוך אוניברסיטה"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "מכללה"
@@ -19933,5 +20268,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "ערוך מכללה"
@@ -19939,5 +20274,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "קולנוע"
@@ -19946,10 +20281,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "ערוך קולנוע"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "ספרייה"
@@ -19958,9 +20293,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "ערוך ספרייה"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "מרכז אומנויות"
@@ -19968,10 +20303,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "ערוך מרכז אומנויות"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "תיאטרון"
@@ -19980,10 +20315,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "ערוך תיאטרון"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "מקום תפילה"
@@ -19993,5 +20328,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "ערוך מקום תפילה"
@@ -20000,6 +20335,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "דת"
@@ -20008,66 +20343,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "בהאי"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "בודהיסט"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "נוצרי"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "הינדי"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "יהודי"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "מוסלמי"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "סיקי"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "ספיריטואליסט"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "טאואיסט"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr ""
@@ -20076,81 +20411,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "אנגליקני"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "באפטיסט"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "קתולי"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "לותרני"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "מתודיסט"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "מורמוני"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "אורתודוקסי"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "פרוטסטנטי"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "שיעי"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "סוני"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "כתובות"
@@ -20159,5 +20494,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "ערוך כתובת"
@@ -20165,5 +20500,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "מספר בית"
@@ -20171,20 +20506,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "שם בית"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "שם עיר"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "מיקוד"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "קוד מדינה"
@@ -20193,5 +20528,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -20199,61 +20534,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "סכמת מספור"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "אי-זוגי"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "זוגי"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "מעשה אדם"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "מגדל"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "ערוך מגדל"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20261,25 +20596,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "מגדל מים"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "ערוך מגדל מים"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "מגדלור"
@@ -20287,10 +20622,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "ערוך מגדלור"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "טחנת רוח"
@@ -20298,10 +20633,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "ערוך טחנת רוח"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "צינור"
@@ -20310,37 +20645,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "ערוך צינור"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr ""
@@ -20350,10 +20685,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr ""
@@ -20361,10 +20696,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -20372,10 +20707,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -20383,10 +20718,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr ""
@@ -20394,5 +20729,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -20400,5 +20735,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr ""
@@ -20408,35 +20743,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "תחנת כח"
@@ -20445,10 +20780,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "ערוך תחנת כח"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr ""
@@ -20457,5 +20792,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -20463,10 +20798,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "עמוד חשמל"
@@ -20477,23 +20812,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "ערוך עמוד חשמל"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "קו מתח"
@@ -20502,75 +20837,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "ערוך קו מתח"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "שירותים"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "תיבת דואר"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "טלפון"
@@ -20579,5 +20914,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "ערוך טלפון"
@@ -20585,5 +20920,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr ""
@@ -20591,5 +20926,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr ""
@@ -20597,5 +20932,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20603,5 +20938,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr ""
@@ -20609,15 +20944,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "כרטיסי טלפון"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr ""
@@ -20626,5 +20961,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "ערוך תחנת מיחזור"
@@ -20632,35 +20967,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "ספסל"
@@ -20669,31 +21004,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20764,40 +21099,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "ירוק"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "דשא"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -20806,30 +21140,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "מזרקה"
@@ -20838,10 +21172,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -20850,10 +21184,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -20861,33 +21195,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "סופרמרקט"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "ערוך סופרמרקט"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "מכולת"
@@ -20895,9 +21229,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "ערוך מכולת"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "קיוסק"
@@ -20905,27 +21239,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "ערוך קיוסק"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -20933,5 +21267,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "ערוך מכונת ממכר"
@@ -20939,88 +21273,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "שוברי טלפון"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "שוברים"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "קונדומים"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "טמפונים"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "שקיות צואה"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "קצבייה"
@@ -21028,9 +21362,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "ערוך קצבייה"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "מאפייה"
@@ -21038,9 +21372,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "ערוך מאפייה"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "פרחים"
@@ -21048,18 +21382,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "ערוך חנות פרחים"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "ערוך חנות אורגנית"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21067,54 +21401,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "ערוך חנות מחשבים"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "ערוך חנות אלקטרוניקה"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "ערוך חנות רהיטים"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr ""
@@ -21122,9 +21456,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21132,9 +21466,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "חנות עשה-זאת-בעצמך"
@@ -21142,54 +21476,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "ערוך חנות עשה-זאת-בעצמך"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "מספרה"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "ערוך מספרה"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "ערוך חנות נעליים"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "ערוך חנות צעצועים"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "ערוך חנות וידאו"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "ניקוי יבש"
@@ -21197,9 +21531,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "ערוך ניקוי יבש"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "מכבסה"
@@ -21207,9 +21541,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "ערוך מכבסה"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr ""
@@ -21217,28 +21551,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "ערוך חנות ספורט"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "ערוך אופטיקאי"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "בנק"
@@ -21246,14 +21580,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "ערוך בנק"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -21261,5 +21595,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "ערוך החלפת כסף"
@@ -21267,15 +21601,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "רופאים"
@@ -21283,18 +21617,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "ערוך רופאים"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -21302,5 +21636,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "ערוך בית מרקחת"
@@ -21308,9 +21642,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "בית חולים"
@@ -21318,10 +21652,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -21330,5 +21664,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "ערוך נקודת גישה בחירום"
@@ -21337,20 +21671,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "מספר טלפון"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -21358,5 +21692,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -21365,59 +21699,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "ערוך וטרינרי"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "מקומות"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "יבשת"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "ארץ"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "ערוך ארץ"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "מדינה"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "אזור"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "מחוז"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "ערוך מחוז"
@@ -21425,15 +21764,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "עיר"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "ערוך עיר"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "עיירה"
@@ -21441,10 +21780,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "ערוך עיירה"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "פרבר"
@@ -21452,25 +21791,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "ערוך פרבר"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "כפר"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "כפר קטן"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
@@ -21478,5 +21817,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "מקומיות"
@@ -21484,10 +21823,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "ערוך מקומיות"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "אי"
@@ -21495,10 +21834,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "ערוך אי"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21506,5 +21845,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21512,5 +21851,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "פתח מערה"
@@ -21518,10 +21857,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "ערוך פתח מערה"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "פסגה"
@@ -21529,10 +21868,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "ערוך פסגה"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "קרחון"
@@ -21540,10 +21879,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "ערוך קרחון"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "הר געש"
@@ -21551,70 +21890,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "ערוך הר געש"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "גבולות"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "לאומי"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "ערוך גבול לאומי"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "מנהלי"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "ערוך גבול מנהלי"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "אזרחי"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "ערוך תחום אזרחי"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "פוליטי"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "ערוך תחום פוליטי"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "גן לאומי"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "ערוך תחום גן לאומי"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "עץ"
@@ -21623,15 +21962,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "ערוך עץ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "חורש"
@@ -21640,5 +21979,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "ערוך חורש"
@@ -21646,17 +21985,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "מחטני"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "יער"
@@ -21665,14 +22004,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -21680,25 +22019,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr ""
@@ -21706,10 +22045,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "שדה-בור"
@@ -21717,5 +22056,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "ערוך שדה-בור"
@@ -21723,5 +22062,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -21730,45 +22069,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -21776,25 +22115,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "דשא"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21802,10 +22141,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr ""
@@ -21813,20 +22152,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr ""
@@ -21834,5 +22173,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -21840,15 +22179,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -21856,9 +22195,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "ערוך בית-קברות"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -21866,39 +22205,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr ""
@@ -21906,15 +22245,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "צבאי"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr ""
@@ -21922,55 +22261,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr ""
@@ -21980,5 +22319,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr ""
@@ -21987,10 +22326,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr ""
@@ -21998,5 +22337,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr ""
@@ -22005,5 +22344,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -22011,34 +22350,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr ""
@@ -22047,15 +22386,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr ""
@@ -22063,5 +22402,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22070,5 +22409,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22076,5 +22415,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22146,5 +22485,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22153,17 +22492,17 @@
 msgstr "אופניים"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22216,5 +22555,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22223,13 +22562,13 @@
 msgstr "רגל"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr ""
@@ -22243,10 +22582,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr ""
@@ -22254,31 +22593,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr ""
@@ -22287,30 +22626,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22748,11 +23087,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "מיושן"
@@ -24776,5 +25115,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25446,4 +25785,12 @@
 #.
 #. <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"/>
@@ -25468,5 +25815,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "היסטורי"
@@ -25480,5 +25827,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "מחצבה"
@@ -25492,5 +25839,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr ""
@@ -25512,5 +25859,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr ""
@@ -25524,5 +25871,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "יער"
@@ -25536,5 +25883,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr ""
@@ -25557,5 +25904,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "קמעוני"
@@ -25569,5 +25916,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "תעשייתי"
@@ -25581,5 +25928,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25593,5 +25940,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25605,5 +25952,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25660,7 +26007,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "צבאי"
@@ -25674,5 +26021,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "בית עלמין"
@@ -25685,5 +26032,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "פיסגה"
@@ -25698,5 +26045,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "קרחון"
@@ -25710,5 +26057,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "הר געש"
@@ -25763,8 +26110,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "טבעי"
@@ -25778,5 +26125,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr ""
@@ -25790,5 +26137,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr ""
@@ -25802,8 +26149,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "שטח"
+msgstr ""
 
 #. color water
@@ -25815,5 +26161,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "בוץ"
@@ -25827,5 +26173,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "חוף"
@@ -25903,8 +26249,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr ""
@@ -25952,7 +26298,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "גבול"
@@ -26102,11 +26448,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "מקום"
@@ -26154,6 +26500,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "כתובת"
@@ -26461,9 +26807,58 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "שגיאה בעת טעינת העמוד {0}"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "ניתן לערוך דפי עזרה מהעזרה המקוונת של JOSM בלבד"
+#~ msgid "File could not be found."
+#~ msgstr "לא ניתן למצוא את הקובץ."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "אנא בחר לפחות משימה אחת להורדה"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "העלאה ל-API של OSM נכשלה"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "יחס מתנגש"
+
+#~ msgid "Error while parsing"
+#~ msgstr "שגיאה בעת פיענוח"
+
+#~ msgid "File not found"
+#~ msgstr "קובץ לא נמצא"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "נא הזן את נקודות הציון הרצויות תחילה."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "בחר סימניה תחילה."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "נא הזן מחרוזת לחיפוש"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "לא יכול לקרוא את תוצאות חיפוש המקום מהשרת"
+
+#~ msgid "name"
+#~ msgstr "שם"
+
+#~ msgid "zoom"
+#~ msgstr "מיקוד"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "בחר שורה להעתקה"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(ניתן לשנות את מספר הימים שאחריהם האזהרה תופיע<br>ע\"י קביעת אפשרות "
+#~ "התצורה 'pluginmanager.warntime')."
+
+#~ msgid "Request Update"
+#~ msgstr "בקש עדכון"
+
+#~ msgid "requested: {0}"
+#~ msgstr "התבקש: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "שגיאה בבקשת עדכון"
 
 #~ msgid "Move"
@@ -26487,7 +26882,4 @@
 #~ msgid "Merging conflicts."
 #~ msgstr "התנגשויות מתמזגות"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "רענן את רשימת הבחירה."
 
 #~ msgid "Resolve Conflicts"
@@ -26532,4 +26924,7 @@
 #~ msgstr "כל הדרכים היו ריקות"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "ניתן לערוך דפי עזרה מהעזרה המקוונת של JOSM בלבד"
+
 #~ msgid "Open in Browser"
 #~ msgstr "פתח בדפדפן"
@@ -26537,4 +26932,7 @@
 #~ msgid "JOSM Online Help"
 #~ msgstr "עזרה מקוונת עבור JOSM"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "שגיאה בעת טעינת העמוד {0}"
 
 #~ msgid ""
@@ -26576,7 +26974,4 @@
 #~ msgid "<nd> has zero ref"
 #~ msgstr "ל <nd> אין התייחסות (ref)"
-
-#~ msgid "Aborting..."
-#~ msgstr "מבטל..."
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
@@ -26698,9 +27093,4 @@
 #~ msgstr "בחר משתמש בעזרת פאנל המחברים"
 
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} תוסף עודכן בהצלחה. נא לאתחל את JOSM."
-#~ msgstr[1] "{0} תוספים עודכנו בהצלחה. נא לאתחל את JOSM."
-
 #~ msgid ""
 #~ "The plugin {0} seems to be broken or could not be downloaded "
@@ -26806,7 +27196,4 @@
 #~ msgstr "ביטול מחיקת יחס..."
 
-#~ msgid "Keep mine"
-#~ msgstr "שמור את שלי"
-
 #~ msgid "Update failed"
 #~ msgstr "עדכון נכשל"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 18273)
+++ applications/editors/josm/i18n/po/is.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-20 01:46+0000\n"
-"Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-25 16:06+0000\n"
+"Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
 "Language-Team: Icelandic <is@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:04+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Bý til aðal notandaviðmót"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Hjálp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Aðvörun"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Villa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "ÓÞEKKT"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Um JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Sýna upplýsingar um JOSM."
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "OpenStreetMap ritill"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Útgáfa {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Síðast breytt {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java útgáfa {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Vefsíða."
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Villutilkynningar"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Upplýsingar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Lestu mig"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Útgáfa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Höfundar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Leyfi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Viðbætur"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Um JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Skrá fannst ekki."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -318,42 +301,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -361,5 +343,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -373,19 +355,19 @@
 "Þú verður að velja hnút, veg eða vensl sem hefur verið hlaðið upp nú þegar."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Veldu lag til að sameina þessu lagi."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Veldu lag til að sameina"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Sameina"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -394,50 +376,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Bæta við hnút..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Bæta við hnút með því að slá inn lengd og breidd"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Breyti: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Sláðu inn hnit fyrir nýja hnútinn."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Nota tugabrotsgráður."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Neikvæð gildi tákna vestur- og suðurhvel."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -446,5 +428,5 @@
 msgstr "Breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -453,27 +435,27 @@
 msgstr "Lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Raða hnútum í hring"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Raða völdum hnútum í hring."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -483,5 +465,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -497,30 +479,28 @@
 msgstr "Tól: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Veldu minnst fjóra hnúta"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -530,84 +510,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Raða hnútum í línu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Raða völdum hnútum í beina línu."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Vinsamlegast veldu a.m.k. þrjá hnúta"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "gögnum"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "lagi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "árekstri"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "niðurhali"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Þysja að {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Þysja að {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Ekkert er valið til að þysja að."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Loka opnum breytingarsettum"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Lokar opnum breytingarsettum"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -615,37 +595,37 @@
 msgstr "Skrá: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Þú átt engin opin breytingarsett"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Engin opin breytingarsett"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Sæki opin breytingarsett ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Sameina vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Sameina marga vegi í einn."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Skipta um átt?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Skipta um átt og sameina"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -655,5 +635,5 @@
 "haldist sér. Vilt þú skipta um átt sumra þeirra?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -663,41 +643,41 @@
 "að sameina þá þurfa þeir að vera ein samfelld röð af hnútum"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sameina {0} vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Afrita"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Afrita valda hluti á klemmuborðið."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Veldu eithvað til að afrita"
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Búa til hring"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Búa til hring úr þrem völdum hnútum."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -705,16 +685,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -726,5 +704,5 @@
 msgstr "Fjarlægja"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Eyða völdum hlutum."
@@ -732,6 +710,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -745,73 +723,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Dreifa hnútum jafnt"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Dreifa völdum hnútum á jöfnu millibili á línu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Niðurhala frá OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Niðurhala kortagögnum frá OSM þjóninum."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Niðurhala"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "Í lagi"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -820,39 +775,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "Næ í yfirvensl"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Tvöfalda"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Tvöfalda valið með því að afrita það og líma það aftur."
@@ -862,41 +817,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Hætta"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Hætta í forritinu."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Vista sem GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Vista gögnin í GPX sniði."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Ekkert til að vista. Opnaðu gögn fyrst."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -935,6 +890,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -953,9 +908,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -975,5 +930,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -981,36 +936,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+msgstr "Breytingaskrá hluts"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Sýna breytingarskrá þessa hluts á OpenStreetMap vefnum"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Upplýsingar um hlut"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Sýna upplýsingar um þennan hlut á OpenStreetMap vefnum"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Tengja hnút við veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Tengir endahnút á vegi við nálægan veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr ""
@@ -1020,168 +975,186 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Sameina lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Sameina það lag sem nú er valið öðru lagi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Sameina hnúta"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Sameina valda hnúta á staðsetningu þess elsta."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Veldu minnst tvo hnúta til að sameina."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Hætti við..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Sameina {0} hnúta"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Sameina val lagi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Sameina valda hluti öðru lagi en þeir eru í núna"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Spegla"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Spegla valda hnúta og vegi."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Veldu minnst einn hnút eða veg."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
+#: ../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 ""
+
 #: ../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
-#, java-format
-msgid "Move objects {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
-msgid "down"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
-msgid "left"
-msgstr ""
-
-#. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
 msgid "right"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Færa {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Ný"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Skapa nýtt kort."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Opna..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Opna skrá."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Opna skrár"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Opna skránna „{0}“..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Opna slóð..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Opna slóð (URL)"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Aðskilið lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Sláðu inn slóð (URL) skrárinnar sem þú vilt opna:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Opna slóð"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Niðurhala slóð"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Sæki gögn"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Hornrétta form"
@@ -1191,18 +1164,18 @@
 msgstr "Færa hnúta á lokuðum vegi til svo öll horn séu 90 eða 270 gráður"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1211,9 +1184,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1222,36 +1195,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Hornrétta"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Líma"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Líma innihald klemmuborðsins."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Líma eigindi"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Líma eigindi hluta á klemmuborðinu á alla valda hluti."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1260,5 +1234,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1267,59 +1241,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Stillingar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Sýna stillingar fyrir ritilinn."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Stillingar"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Endurtaka"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Endurtaka afturkallaða aðgerð."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Endurnefna lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Endurnefna skránna líka"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Skipta um átt vega"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Skipta um átt allra valdra vega."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Skipta um átt vega"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1327,10 +1301,10 @@
 msgstr "Vista"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Vista þau gögn sem sjást núna."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1379,21 +1353,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Vista sem..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Vista þau gögn sem sjást núna í nýja skrá."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Velja allt"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1401,10 +1375,10 @@
 msgstr "Velja alla hluti í núverandi lagi. Þetta velur einnig ókláraða hluti."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Sýna stöðuskýrslu"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1412,19 +1386,19 @@
 "villutilkynningar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Stöðuskýrsla"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Afrita á klemmuborðið og loka"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1433,18 +1407,18 @@
 msgstr "Loka"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Skipta veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Skipta veg á völdum hnút(um)."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1456,5 +1430,5 @@
 "hnúta eða hnúta á enda vegs."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1470,9 +1444,9 @@
 "veginn sem þú vilt skipta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Valdir hnútar eru ekki hluti af sama veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1480,10 +1454,10 @@
 msgstr[1] "Vegirnir sem þú valdir innihalda ekki hnútana sem þú valdir."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Þú verður að velja tvo eða fleiri hnúta til að skipta hringlaga veg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1508,70 +1482,70 @@
 msgstr "Skipta veginum {0} í {1} hluta"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Teikna línu á milli GPS punkta."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Aðskilja vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Skipta upp hnút sem er notaður af mörgum vegum."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 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:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 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:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 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:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1581,9 +1555,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1591,80 +1565,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Afturkalla"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Afturkalla síðustu aðgerð."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Afvelja allt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Afvelja alla hluti."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Uppfærir þá hluti sem eru valdir frá þjóninum"
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Uppfæri gögn"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Uppfæra val"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr ""
@@ -1676,8 +1651,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1686,5 +1661,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1692,29 +1667,29 @@
 msgstr "Engar breytingar til að hlaða upp"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Ekkert til að upphala. Náðu í og breyttu einhverjum gögnum fyrst."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1728,11 +1703,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1743,5 +1718,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1751,24 +1726,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Vensl rekast á"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr "Hætta við að hala upp og halda áfrám að breyta"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1779,28 +1752,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Upphal <strong>mistókst</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Upphal mót OSM forritunarviðmótinu mistókst"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1809,17 +1773,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Hleð upp gögnum ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1838,11 +1816,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Þysja inn"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Þysja út"
@@ -1922,21 +1900,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Sæki GPS gögn"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Niðurhöluð GPX gögn"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "GPS gögn"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Sæki gögn"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1944,27 +1918,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "Engin gögn fundust á þessu svæði."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap gögn"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Niðurhal {0} af {1} ({2} eftir)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Uppfæri gögn"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Notandanafn."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+#, fuzzy
+msgid ""
+"Click to check whether objects in your local dataset are deleted on the "
+"server"
+msgstr ""
+"{0} hlutur var fjarlægður úr gögnunum þínum því honum hefur verið eytt á "
+"þjóninum."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Hunsa"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Hætta við að hala upp og halda áfrám að breyta"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1976,7 +1965,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Villa við að spila hljóð"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1998,5 +2002,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2024,38 +2028,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 msgid "Add node into way"
 msgstr "Bæta hnút við veg"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Búa til nýjan hnút."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2064,14 +2068,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr ""
@@ -2091,5 +2095,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2100,5 +2104,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -2158,10 +2162,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2171,4 +2175,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Þysja"
@@ -2186,5 +2191,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Leita..."
@@ -2290,34 +2294,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - Hlutum sem breytt hefur verið"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - Valdir hlutir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - Ókláraðir hlutir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - Hlutir án eiginda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>segð</i></b> - allir undirhlutir sem passa við segðina"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>segð</i></b> - allir yfirhlutir sem passa við segðina"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Notaðu <b>|</b> eða <b>OR</b> t.d. „A | B“ til að leita að A eða B"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2325,9 +2336,9 @@
 "„:“ eða „ “"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Notaðu <b>(</b> og <b>)</b> til að sameina segðir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2337,51 +2348,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Leit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Hefja leit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "stafsetursnæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "stafsetursónæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr ""
@@ -2411,26 +2422,37 @@
 "hnút, veg og vensl"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2439,5 +2461,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2532,4 +2554,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "Í lagi"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2547,8 +2585,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Breyta {0} hlut"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2629,5 +2667,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2663,4 +2701,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2691,32 +2740,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Vensl rekast á"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Fjarlægja úr venslum"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>Valið „{0}“ er notað af venslunum „{1}“ með hlutverkið „{2}“.<br>Eyða "
-"úr venslunum?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>Valið „{0}“ er notað af venslunum „{1}“<br>Eyða úr venslunum?</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr ""
@@ -2724,6 +2747,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2735,5 +2758,5 @@
 "verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2917,15 +2940,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Ógild regluleg segð \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2934,5 +2972,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2941,5 +2979,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2948,5 +2986,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2955,5 +2993,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2961,5 +2999,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2968,5 +3006,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2975,5 +3013,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2982,5 +3020,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2989,19 +3027,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Gat ekki hlaðið upp stillingunum. Ástæðan er: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3010,5 +3071,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "ÓÞEKKT"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3030,20 +3111,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "V"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "A"
@@ -3055,4 +3136,18 @@
 msgid "Changeset {0}"
 msgstr "Breytingarsett {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3119,14 +3214,14 @@
 msgstr "Viðvörun: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3134,5 +3229,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3159,6 +3254,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3218,113 +3313,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
+#, java-format
+msgid "Deleted member ''{0}'' in relation."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
-#, java-format
-msgid "Deleted member ''{0}'' in relation."
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#, java-format
+msgid "Way ''{0}'' with less than two points."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+msgid "More than one \"from\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
-#, java-format
-msgid "Way ''{0}'' with less than two points."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
-msgid "More than one \"from\" way found."
+msgid "More than one \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+msgid "More than one \"via\" found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-msgid "More than one \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
-msgid "More than one \"via\" found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Óþekkt hlutverk \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3345,5 +3440,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3359,5 +3454,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3368,5 +3462,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3395,5 +3488,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "bakgrunnur"
@@ -3461,10 +3554,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3493,5 +3586,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr ""
@@ -3508,4 +3601,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3521,33 +3616,33 @@
 msgstr[1] "{0} stök"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3555,16 +3650,16 @@
 msgstr "Árekstrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3577,4 +3672,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Sæki skilaboð dagsins"
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Loka þessum glugga"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3638,74 +3738,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Notandanafn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3714,9 +3814,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3724,25 +3824,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Virki uppfærðar viðbætur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Hleð inn viðbótum"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3755,11 +3855,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3784,6 +3884,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3884,25 +3984,21 @@
 msgstr "(enginn hlutur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Skrá fannst ekki"
+#: ../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
@@ -3923,5 +4019,5 @@
 msgstr "Ekki sett: Ekki setja þessi eigindi á valda hluta"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3950,24 +4046,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Breyta {0} hlut"
-msgstr[1] "Breyta {0} hlutum"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Eyða völdum hlutum."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "Fjarlægja"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Vensl"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -3979,5 +4072,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4026,5 +4119,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4041,5 +4134,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4239,8 +4332,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4547,6 +4640,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4560,6 +4653,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4617,36 +4710,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Vista"
@@ -4658,5 +4751,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr ""
@@ -4746,4 +4839,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4754,4 +4849,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4765,49 +4861,84 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Raða völdum meðlimum eða öllum listanum"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Hlutverk:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Vistar hlutverk fyrir völd stök"
+
+#: ../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 ""
+
+#: ../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:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Upphal <strong>mistókst</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4844,6 +4975,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4930,10 +5061,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5000,5 +5128,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5043,4 +5172,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5066,6 +5196,6 @@
 msgstr "Upplýsingar um lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5074,22 +5204,22 @@
 msgstr[1] "Allt að {0} hlutum verður breytt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Tómt gildi eyðir lyklinum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<mismunandi>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Breyta eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5098,69 +5228,73 @@
 msgstr[1] "Breyta eigindum allt að {0} hluta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Veldu lykil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Veldu gildi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Veldu hluti til að breyta eigindum þeirra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Eigindi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Eigindi valdra hluta."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Stak í"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Bæti vað eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Breyta eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+msgstr "{0} eigindi & {1} vensl"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+msgstr "Eigindi & vensl"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Breyta venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Fjarlægja úr venslum"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Eyða valinu úr venslunum {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 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/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Eyða eigindum"
@@ -5168,40 +5302,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Sýna lista yfir vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Vensl: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Opna ritil til að breyta völdum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Eyða völdum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Skapa ný vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Eyða völdum venslum"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Velja skráarnafn"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Eyða völdum venslum"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Niðurhala meðlimum"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5228,5 +5382,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5238,9 +5392,9 @@
 msgstr "Val: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Opna þessa stiku sem glugga"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5249,5 +5403,5 @@
 "vinstri tólastikunni."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Smelltu til að minnka/hámarka innihald stikunnar"
@@ -5329,5 +5483,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5359,23 +5514,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Stök og tögg þeirra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr "Yfirvensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr "Undirvensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5384,14 +5539,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5404,9 +5559,9 @@
 "þennan hlut?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr "Mörg stök benda á sama hlutinn"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5416,15 +5571,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5432,5 +5587,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5438,20 +5593,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5460,66 +5615,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr "Bæta völdum stökum á vallistann"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Raða stöknum"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Færa valda meðlimi upp"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Færa valda meðlimi niður"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr "Fjarlægja völd stök úr þessum venslum"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5528,9 +5683,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5539,41 +5694,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Bæta við tómu taggi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hala niður öllum nóðum og vegum í þessum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Niðurhala meðlimum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Vistar hlutverk fyrir völd stök"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Vista hlutverk"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5583,17 +5738,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Breyta venslunum sem valið stak bendir á"
@@ -5604,13 +5759,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5624,14 +5779,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5681,59 +5836,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Raða stöknum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Raða stöknum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Bókamerki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Sláðu inn hnitin fyrst"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Búa til svæði"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Loka breytingarsettinu sem nú er valið"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Sláðu inn nafn fyrir staðsetningu."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Veldu fyrst bókmerki"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Færa valda meðlimi upp"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Færa valda meðlimi upp"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "Minnsta breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "Minnsta lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "Mesta breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "Mesta lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5743,356 +5927,135 @@
 "svæðinu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Afmarkað svæði"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Gagnabankar"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap gögn"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Skipta veg á völdum hnút(um)."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "GPS gögn"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Sækja sem nýtt lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Niðurhalssvæði"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Niðurhala"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Eyða völdu lagi."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Niðurhalssvæði er of stórt. Verður sennilega hafnað af þjóni"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Stærð niðurhalssvæðis er ok, stærð sennilega ásættanleg fyrir þjón"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Loka breytingarsettinu sem nú er valið"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Veldu hlut til að breyta fyrst."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Sláðu inn nafn á stað til að leita að"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Sláðu inn nafn á stað til að leita að"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Núll bendill, hugsanlega vantar eigindi."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Sláðu inn leitarstreng"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Get ekki lesið niðurstöðu staðarleitar frá þjóni"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Sláðu inn nafn á stað til að leita að"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Staðir"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "nafn"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "gerð"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "nálægt"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "þysja"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Gagnvirkt kort"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "Þysjun á lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x frá"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "til"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y frá"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Reitnúmer"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Loka þessum glugga"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Hnútur {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Leita..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+msgid "Click to start searching for places"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6450,4 +6413,6 @@
 #. 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" />
@@ -6828,6 +6793,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6893,11 +6859,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6907,6 +6873,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6916,79 +6882,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Heiti"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Gerð"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "nálægt"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Gagnvirkt kort"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "Þysjun á lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x frá"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "til"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y frá"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Reitnúmer"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Loka þessum glugga"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Hnútur {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7069,4 +7302,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7358,6 +7592,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0} hlut verður breytt:"
@@ -7460,5 +7694,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7492,59 +7735,59 @@
 msgstr "Halda áfrám ad hlaða upp"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
-msgid "No images with readable timestamps found."
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
 #, java-format
 msgid "Reading {0}..."
 msgstr "Les {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
+msgid "No images with readable timestamps found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7552,51 +7795,51 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Samstilla klukkur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG myndir (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7604,30 +7847,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Sérsníða teikningu lína"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7635,5 +7878,5 @@
 msgstr "Sérsníða liti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7642,5 +7885,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7649,43 +7892,43 @@
 msgstr "Veldu lit"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Flytja inn hljóð"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Flytja inn myndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7695,28 +7938,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Lýsing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr "Tímaspan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "Lengd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Lengd: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7725,5 +7968,5 @@
 msgstr[1] "{0} leiðir, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7732,10 +7975,10 @@
 msgstr[1] "{0} punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Breyta í gagnalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7743,11 +7986,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7757,29 +8000,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7788,13 +8031,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7802,5 +8041,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7808,23 +8047,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Gagnalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "útgáfa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7833,12 +8072,13 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, fuzzy, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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} hlutur var fjarlægður úr gögnunum þínum því honum hefur verið eytt á "
@@ -7849,27 +8089,42 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] "{0} hnútur"
+msgstr[1] "{0} hnútar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "Tölfræði um {0}:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "API útgáfa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8032,6 +8287,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8046,6 +8299,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8215,5 +8466,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8543,20 +8794,19 @@
 msgstr "Tungumál"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8571,6 +8821,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Uppfæra"
@@ -8722,68 +8971,102 @@
 msgstr "Flýtileið"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Veldu hlut til að afrita fyrst."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Fjarlægja völd stök úr þessum venslum"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Breyta gildi valins lykils í öllum völdum hlutum"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Bæta við nýju taggi"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Loka völdum breytingarsettum"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Eyða völdum venslum"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Hleð upp gögnum úr laginu „{0}“"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8963,5 +9246,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Frekari upplýsingar um þessa forstillingu"
@@ -9031,11 +9314,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Punktar frá {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9043,5 +9326,5 @@
 msgstr "Hef samband við OpenStreetMap miðlara..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9148,5 +9431,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -9372,5 +9655,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9397,5 +9680,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9403,5 +9686,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9414,5 +9697,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9423,33 +9706,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Rangt lykilorð eða notandanafn"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Viðvörun: Lykilorðið er sent ódulkóðað"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Vista notandanafn og lykilorð (ódulkóðað)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Sláðu inn lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Innskrá"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Notandanafn (eða netfang) á OSM þjóninum."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9457,17 +9740,17 @@
 "Lykilorð á OSM þjóninum. Hafðu þetta óútfyllt til að vista ekki lykilorðið."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Slóð OSM þjóns"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "OSM notandanafn (netfang)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9564,5 +9847,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9571,38 +9854,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9610,19 +9893,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Ógildur hlutur með kenni=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9631,7 +9914,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9641,25 +9928,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9667,5 +9954,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9674,5 +9961,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9680,5 +9967,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9687,13 +9974,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Undirbý OSM gögn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr "Undirbý gögn..."
@@ -9704,14 +9991,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Niðurhala frá OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9823,15 +10109,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Uppfæra viðbætur"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Hala niður viðbótum"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9844,8 +10130,8 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] ""
 "Náð var í {0} viðbót. Vinsamlegast endurræstu JOSM til að nota nýju "
@@ -9855,22 +10141,26 @@
 "viðbæturnar."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Sæki íforrit {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9882,10 +10172,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9895,47 +10185,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Síðasta uppfærsa viðbóta var framkvæmd fyrir meira en {0} dögum."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Uppfæra viðbætur"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Viðbótin „{0}“ fannst ekki."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Síðasta uppfærsa viðbóta var framkvæmd fyrir meira en {0} dögum."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Gat ekki hlaðið viðbótina „{0}“. Eyða henni úr listanum yfir viðbætur?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Gera viðbótina óvirka"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Halda viðbótinni"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9945,9 +10246,9 @@
 "yfirskrifa núverandi viðbætur."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9955,19 +10256,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9975,22 +10276,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Frekari upplýsingar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9999,18 +10300,18 @@
 msgstr[1] "Halaði niður lista yfir viðbætur frá {0} þjónum"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Allar innsettar viðbætur eru af nýjustu útgáfu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10023,9 +10324,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Hala niður nýjum viðbótum"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10040,9 +10341,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10064,19 +10365,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "óskilgreint"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Útgáfa {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10142,5 +10443,5 @@
 msgstr "Textinn hefur verið þegar verið afritaður"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10149,5 +10450,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10156,5 +10457,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10164,5 +10465,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10172,10 +10473,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10184,5 +10485,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10191,16 +10492,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10210,5 +10511,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10217,5 +10518,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10224,5 +10525,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10231,10 +10532,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10243,10 +10544,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10257,5 +10558,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10265,5 +10566,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10274,5 +10575,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10374,11 +10675,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10521,5 +10815,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -10535,10 +10830,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10546,103 +10841,103 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10692,46 +10987,47 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
+msgstr "Færa valið lag upp í röðinni"
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -10983,5 +11279,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -10994,10 +11290,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11045,13 +11341,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11060,13 +11356,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11174,7 +11470,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Sýna hnit sem"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11192,5 +11487,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11231,13 +11526,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11368,22 +11663,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Bæta við nýju lagi"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11391,5 +11686,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11403,9 +11698,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11425,9 +11720,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "Leiðrétta stöðu WMS lagsins"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11449,5 +11743,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Tómt lag"
@@ -11476,5 +11770,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11483,18 +11777,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11589,5 +11883,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Engin göng eru hlaðin til að vinna með."
@@ -11993,7 +12287,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "vatn"
@@ -12194,32 +12488,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr ""
@@ -12308,24 +12602,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
-msgstr ""
-
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+msgstr "Búa til marghyrning"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
-msgstr ""
-
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+msgstr "Búa til marghyrning."
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12469,4 +12763,9 @@
 msgstr ""
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Lag"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12512,30 +12811,30 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
+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:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
+msgid "Confirm Remote Control action"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-msgid "Do you want to allow this?"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-msgid "Confirm Remote Control action"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-msgid "Remote Control has been asked to create a new node."
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12554,7 +12853,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12563,4 +12860,5 @@
 #: ../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 ""
@@ -12582,25 +12880,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12630,92 +12928,86 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Gagnvirkt kort"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Þysja"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Skoða notandasíðu"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Þysjun á lag"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
 msgstr ""
 
@@ -12729,5 +13021,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12889,5 +13181,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nafn götu"
@@ -12931,29 +13223,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -12961,33 +13253,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Leysa árekstra"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13193,8 +13485,4 @@
 msgstr "Laga valdar villur."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Hunsa"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13239,24 +13527,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Strandlengjur."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "strandlengja"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "Skipta um átt og sameina"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13279,18 +13566,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13531,4 +13818,8 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13743,7 +14034,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "bygging"
@@ -13757,5 +14048,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr ""
@@ -13765,25 +14056,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr ""
@@ -13875,21 +14166,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "Eyði lagi {0} af {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14122,9 +14418,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
@@ -14570,6 +14866,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Tilvísun"
@@ -15131,5 +15427,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15141,5 +15437,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "skógur"
@@ -15427,7 +15723,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "já"
@@ -15576,8 +15872,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "nei"
@@ -15704,31 +16000,4 @@
 msgstr "Breyti hringtorgi"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Gerð"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15849,5 +16118,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "íbúðargata"
@@ -15882,5 +16151,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "þjónustuvegur"
@@ -15915,5 +16184,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "byggingarsvæði"
@@ -16303,12 +16572,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Rekstraraðili"
@@ -16521,6 +16790,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Hæð (y/s)"
@@ -16947,5 +17216,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr ""
@@ -17478,25 +17747,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Opnunartími"
@@ -17562,24 +17831,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17592,24 +17861,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17622,24 +17891,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17672,6 +17941,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Tilvísun"
@@ -17687,5 +17956,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
@@ -17699,5 +17968,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr ""
@@ -17933,5 +18202,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Skýli"
@@ -18399,5 +18668,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr ""
@@ -18412,5 +18681,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skíði"
@@ -18564,16 +18833,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Fornleifasvæði"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Breyti fornleifasvæði"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -18581,55 +18863,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Breyti minnisvarða"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Frístundir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -18637,35 +18919,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Breyti leikvöll"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Íþróttir"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Íþróttaleikvangur"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Breyti íþróttaleikvang"
@@ -18679,6 +18961,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "veldu íþrótt:"
@@ -19070,30 +19352,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "íþrótt"
@@ -19103,227 +19385,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "bogfimi"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "ástralskur fótbolti"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "hafnabolti"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "körfubolti"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "klifur"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokkí"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "skotfimi"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skautar"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "skíði"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "sund"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "borðtennis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfvöllur"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Breyti golfvelli"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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 "gerð"
 
 #. item "Sport/Multi" combo "type"
@@ -19360,203 +19695,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "völlur"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "íþróttamiðstöð"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "íþróttaleikvangur"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skautar"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Sund"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
@@ -19564,56 +19899,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Breyti skíðasvæði"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Skotfimi"
@@ -19621,182 +19956,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Breyti skotfimi"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerískur fótbolti"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Breyti Amerískum fótbolta"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Breyti borðtennis"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Breyti tennis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Mannvirki"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Byggingar"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Bygging"
@@ -19804,5 +20139,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -19810,10 +20145,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Breyti opinberri byggingu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -19821,10 +20156,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Breyti ráðhúsi"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -19832,10 +20167,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Breyti sendiráði"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -19844,10 +20179,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Breyti dómshúsi"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Fangelsi"
@@ -19856,10 +20191,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Breyti fangelsi"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -19869,10 +20204,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Breyti lögreglustöð"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -19881,10 +20216,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Breyti slökkvistöð"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Pósthús"
@@ -19892,5 +20227,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Breyti pósthúsi"
@@ -19898,15 +20233,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Skóli"
@@ -19914,10 +20249,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Breyti skóla"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Háskóli"
@@ -19925,10 +20260,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Breyti háskóla"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Menntaskóli"
@@ -19936,5 +20271,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Breyti menntaskóla"
@@ -19942,5 +20277,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -19949,10 +20284,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Breyti kvikmyndahúsi"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bókasafn"
@@ -19961,9 +20296,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Breyti bókasafni"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -19971,10 +20306,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Breyti listamiðstöð"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Leikhús"
@@ -19983,10 +20318,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Breyti leikhúsi"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -19996,5 +20331,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Breyti helgistað"
@@ -20003,6 +20338,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr ""
@@ -20011,66 +20346,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr ""
@@ -20079,81 +20414,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Heimilisfang"
@@ -20162,5 +20497,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Breyti heimilisfangi"
@@ -20168,5 +20503,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Húsnúmer"
@@ -20174,20 +20509,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nafn húss"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Landskóði"
@@ -20196,5 +20531,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -20202,61 +20537,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Mannvirki"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Turn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20264,25 +20599,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Viti"
@@ -20290,10 +20625,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Breyti vita"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -20301,10 +20636,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Breyti vindmyllu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -20313,37 +20648,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Breyti leiðslu"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr ""
@@ -20353,10 +20688,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Krani"
@@ -20364,10 +20699,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Breyti krana"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -20375,10 +20710,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -20386,10 +20721,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -20397,5 +20732,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Breyti eftirlitsmyndavél"
@@ -20403,5 +20738,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Rafall"
@@ -20411,35 +20746,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Breyti rafli"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Orkuver"
@@ -20448,10 +20783,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Breyti orkuveri"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -20460,5 +20795,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Breyti spennustöð"
@@ -20466,10 +20801,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Tilvísunarnúmer línunnar"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -20480,23 +20815,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Breyti háspennustaur"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Raflína"
@@ -20505,75 +20840,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Breyti raflínu"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Volt"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Salerni"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Athugasemd"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -20582,5 +20917,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Breyti almenningssíma"
@@ -20588,5 +20923,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Mynt"
@@ -20594,5 +20929,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Athugasemd"
@@ -20600,5 +20935,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20606,5 +20941,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Debetkort"
@@ -20612,15 +20947,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -20629,5 +20964,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Breyti endurvinnslustöð"
@@ -20635,35 +20970,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Föt"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Bekkur"
@@ -20672,31 +21007,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20767,40 +21102,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "Landafræði"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -20809,30 +21143,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Hæð"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -20841,10 +21175,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Breyti gosbrunn"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -20853,10 +21187,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Breyti drykkjarvatni"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -20864,33 +21198,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Breyti barnalúgu"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Verslanir"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr ""
@@ -20898,9 +21232,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Sjoppa"
@@ -20908,27 +21242,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Breyti sjoppu"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "Ferðaskrifstofa"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "Breyti ferðaskrifstofu"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Sjálfsali"
@@ -20936,5 +21270,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr ""
@@ -20942,88 +21276,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "dagblöð"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "dót"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Slátrari"
@@ -21031,9 +21365,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Breyti slátrara"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Bakarí"
@@ -21041,9 +21375,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Breyti bakaríi"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Blómabúð"
@@ -21051,18 +21385,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Breyti blómabúð"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Lífræn búð"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Breyti lífrænni búð"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21070,54 +21404,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Vínbúð"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Tölvubúð"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Breyti tölvubúð"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Raftækjabúð"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Breyti raftækjabúð"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hljómtækjaverslun"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Breyti hljómtækjaverslun"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Húsgagnaverslun"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Breyti húsgagnaverslun"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr ""
@@ -21125,9 +21459,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21135,9 +21469,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -21145,54 +21479,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Skrifstofuvörur"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Breyti skrifstofuvörum"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Hársnyrtir"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Breyti hársnyrti"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Skóbúð"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Breyti skóbúð"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Dótabúð"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Breyti dótabúð"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Efnalaug"
@@ -21200,9 +21534,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Breyti efnalaug"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Þvottahús"
@@ -21210,9 +21544,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Breyti þvottahúsi"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Útivistarbúð"
@@ -21220,28 +21554,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Breyti útivistarbúð"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Breyti sjóntækjasmið"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Fjármál"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Banki"
@@ -21249,14 +21583,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Breyti banka"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Hraðbanki"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -21264,5 +21598,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Breyti gjaldeyrisskiptum"
@@ -21270,15 +21604,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Breyti hraðbanka"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Heilsa"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Læknir"
@@ -21286,18 +21620,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Breyti lækni"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -21305,5 +21639,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Apótek"
@@ -21311,9 +21645,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Spítali"
@@ -21321,10 +21655,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Breyti spítala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr ""
@@ -21333,5 +21667,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -21340,20 +21674,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -21361,5 +21695,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -21368,59 +21702,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Breyti dýralækni"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr "Landafræði"
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Staðir"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Breyti landi"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Fylki"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Svæði"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Sýsla"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Breyti sýslu"
@@ -21428,15 +21767,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Borg"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Bær"
@@ -21444,10 +21783,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Breyti bæ"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Hverfi"
@@ -21455,25 +21794,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Breyti hverfi"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Þorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
@@ -21481,5 +21820,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr ""
@@ -21487,10 +21826,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Eyja"
@@ -21498,10 +21837,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Breyti eyju"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21509,5 +21848,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21515,5 +21854,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -21521,10 +21860,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Breyti hellismunna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Tindur"
@@ -21532,10 +21871,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Breyti tind"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Jökull"
@@ -21543,10 +21882,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Breyti jökli"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -21554,70 +21893,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Breyti eldfjalli"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Landamæri"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Landnýting"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Tré"
@@ -21626,15 +21965,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Breyti tré"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Skógur"
@@ -21643,5 +21982,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Breyti skóg"
@@ -21649,17 +21988,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "barrskógur"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "laufskógur"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "blandaður"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -21668,14 +22007,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Breyti ræktuðum skóg"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -21683,25 +22022,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr ""
@@ -21709,10 +22048,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr ""
@@ -21720,5 +22059,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr ""
@@ -21726,5 +22065,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr ""
@@ -21733,45 +22072,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -21779,25 +22118,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Garður"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21805,10 +22144,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr ""
@@ -21816,20 +22155,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr ""
@@ -21837,5 +22176,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -21843,15 +22182,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -21859,9 +22198,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Breyti grafreit"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr ""
@@ -21869,39 +22208,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Breyti kirkjugarðslandnýtingu"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Smásala"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr ""
@@ -21909,15 +22248,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr ""
@@ -21925,55 +22264,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Marghyrningur"
@@ -21983,5 +22322,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Breyta marghyrningi"
@@ -21990,10 +22329,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr ""
@@ -22001,5 +22340,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Beygjutakmörkun"
@@ -22008,5 +22347,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Breyti beygjutakmörkun"
@@ -22014,34 +22353,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "vinstri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "hægri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "óleyfilegt að halda beint áfrám"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "óleyfilegt að taka U-beygju"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -22050,15 +22389,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "gegnum hnút eða veg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "að vegi"
@@ -22066,5 +22405,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22073,5 +22412,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22079,5 +22418,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22149,5 +22488,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22156,17 +22495,17 @@
 msgstr "hjól"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22219,5 +22558,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22226,13 +22565,13 @@
 msgstr "fótgangandi"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr ""
@@ -22246,10 +22585,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr ""
@@ -22257,31 +22596,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr ""
@@ -22290,30 +22629,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22751,11 +23090,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr ""
@@ -24779,5 +25118,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25449,4 +25788,12 @@
 #.
 #. <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"/>
@@ -25471,5 +25818,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr ""
@@ -25483,5 +25830,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr ""
@@ -25495,5 +25842,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr ""
@@ -25515,5 +25862,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr ""
@@ -25527,5 +25874,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "skógur (ræktaður)"
@@ -25539,5 +25886,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr ""
@@ -25560,5 +25907,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "smásala"
@@ -25572,5 +25919,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "iðnaður"
@@ -25584,5 +25931,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25596,5 +25943,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25608,5 +25955,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25663,7 +26010,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr ""
@@ -25677,5 +26024,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr ""
@@ -25688,5 +26035,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "tindur"
@@ -25701,5 +26048,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "jökul"
@@ -25713,5 +26060,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "eldfjall"
@@ -25766,8 +26113,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr ""
@@ -25781,5 +26128,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr ""
@@ -25793,5 +26140,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr ""
@@ -25805,8 +26152,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "skógur"
+msgstr ""
 
 #. color water
@@ -25818,5 +26164,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "leðja"
@@ -25830,5 +26176,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "strönd"
@@ -25906,8 +26252,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr ""
@@ -25955,7 +26301,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr ""
@@ -26105,11 +26451,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr ""
@@ -26157,6 +26503,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr ""
@@ -26464,12 +26810,49 @@
 msgstr ""
 
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Nota forstillinguna „{0}“"
-
-#~ msgid "Aborting..."
-#~ msgstr "Hætti við..."
+#~ msgid "File could not be found."
+#~ msgstr "Skrá fannst ekki."
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Upphal mót OSM forritunarviðmótinu mistókst"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Vensl rekast á"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>Valið „{0}“ er notað af venslunum „{1}“ með hlutverkið „{2}“."
+#~ "<br>Eyða úr venslunum?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Valið „{0}“ er notað af venslunum „{1}“<br>Eyða úr venslunum?</html>"
+
+#~ msgid "File not found"
+#~ msgstr "Skrá fannst ekki"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Sláðu inn hnitin fyrst"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Veldu fyrst bókmerki"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Sláðu inn leitarstreng"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Get ekki lesið niðurstöðu staðarleitar frá þjóni"
+
+#~ msgid "name"
+#~ msgstr "nafn"
+
+#~ msgid "zoom"
+#~ msgstr "þysja"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Veldu hlut til að afrita fyrst."
 
 #~ msgid "Unsaved Changes"
@@ -26589,4 +26972,10 @@
 #~ msgstr "Gagnalag"
 
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Nota forstillinguna „{0}“"
+
 #~ msgid "Occupied By"
 #~ msgstr "Gengt af"
@@ -26624,7 +27013,4 @@
 #~ msgstr "kort"
 
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Uppfærir þá hluti sem eru valdir frá þjóninum"
-
 #~ msgid "nodes"
 #~ msgstr "hnútar"
@@ -26638,7 +27024,4 @@
 #~ msgid "Sort"
 #~ msgstr "Raða"
-
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Raða völdum meðlimum eða öllum listanum"
 
 #~ msgid "Members: {0} (linked: {1})"
@@ -26655,7 +27038,4 @@
 #~ msgid "Combine Anyway"
 #~ msgstr "Sameina þá"
-
-#~ msgid "Deleting layer {0} of {1}"
-#~ msgstr "Eyði lagi {0} af {1}"
 
 #~ msgid "Do you really want to delete layer ''{0}''?"
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 18273)
+++ applications/editors/josm/i18n/po/it.po	(revision 18508)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-23 12:41+0000\n"
-"Last-Translator: Davide Prade <davalv@alice.it>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-30 17:45+0000\n"
+"Last-Translator: Stefano Pallicca <pallicca@gmail.com>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,67 +13,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Creazione dell'interfaccia principale"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Aiuto"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -86,12 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -101,27 +95,26 @@
 msgstr "Attenzione"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Impossibile leggere il file ''{0}''.<br> Errore: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -129,23 +122,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -153,5 +147,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -160,21 +154,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -183,5 +178,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -194,17 +189,9 @@
 msgstr "Errore"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "SCONOSCIUTO"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Informazioni su JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Mostra le informazioni sul programma."
@@ -212,37 +199,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Versione {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Ultima modifica {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java versione {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Pagina iniziale"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Segnalazione errori"
@@ -252,5 +239,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -258,33 +245,29 @@
 msgstr "Informazioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Leggimi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revisione"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Contributi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licenza"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Estensioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Informazioni su JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Impossibile trovare il file."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -323,42 +306,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -366,5 +348,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -377,19 +359,19 @@
 msgstr "Selezionare almeno un nodo, percorso o relazione già caricato."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Selezionare il livello di riferimento."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Seleziona il livello di riferimento."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Unisci"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -399,50 +381,50 @@
 "<html>Non ci sono livelli al quale unire il livello sorgente ''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Nessun livello di riferimento"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Aggiungi nodo..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Aggiungi un nodo inserendo latitudine e longitudine"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Modifica: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Inserire le coordinate per il nuovo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Usa i gradi decimali."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valori negativi denotano l'emisfero Occidentale/Meridionale."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -451,5 +433,5 @@
 msgstr "Latitudine"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -458,27 +440,27 @@
 msgstr "Longitudine"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Disponi i nodi in cerchio"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Sposta i nodi selezionati disponendoli su un cerchio."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -488,5 +470,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -502,30 +484,28 @@
 msgstr "Strumenti: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Selezionare almeno quattro nodi."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -535,84 +515,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Disponi i nodi in linea"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Sposta i nodi selezionati disponendoli su una linea."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Selezionare almeno tre nodi."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "conflitto"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "scarica"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Fa lo zoom della vista a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Visualizza: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Nessuna selezione da ingrandire"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Nessun conflitto da ingrandire"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Chiudi i gruppi di modifiche aperti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Chiude i gruppi di modifiche aperti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -620,37 +600,37 @@
 msgstr "File: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Non ci sono gruppi di modifiche aperti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Nessun gruppo di modifiche aperto"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Scaricamento dei gruppi di modifiche aperti ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Unisci percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Unisce diversi percorsi in uno."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Inverti direzione?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Inverti direzione e unisci"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -660,5 +640,5 @@
 "la direzione di qualcuno?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -668,41 +648,41 @@
 "di nodi)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Unisci {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Selezionare almeno due percorsi da unire."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Copia"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Copia gli oggetti selezionati all'interno del buffer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Seleziona qualcosa da copiare."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Crea cerchio"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Crea un cerchio a partire da tre nodi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Questi nodi non sono disposti su una circonferenza. Annullo."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -712,16 +692,14 @@
 "due o tre nodi."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -733,5 +711,5 @@
 msgstr "Cancella"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Cancella gli oggetti selezionati."
@@ -739,6 +717,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -752,54 +730,29 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Disponi i nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Disponi i nodi a distanze regolari lungo una linea"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Scarica da OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Scarica i dati della mappa dal server OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Scarica"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Selezionare almeno un compito per scaricare"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr "Scarica i percorsi/relazioni da cui dipende..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
@@ -807,20 +760,22 @@
 "selezionate"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr "Era richiesto un Id > 0, ottenuto {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, fuzzy, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "Atteso ID > 0 . Ottenuto {0}."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -829,39 +784,39 @@
 msgstr "il parametro ''{0}'' non deve essere nullo"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Ci sono stati {0} conflitti durante l'importazione"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Conflitti durante lo scaricamento"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Caricamento degli elementi da cui dipende la primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr "({0}/{1}) Caricamento degli elementi da cui dipende il nodo {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Caricamento degli elementi da cui dipende la primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr "({0}/{1}) Caricamento degli elementi da cui dipende il percorso {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Caricamento degli elementi da cui dipende la primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr "({0}/{1}) Caricamento degli elementi da cui dipende la relazione {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplica"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplica la selezione copiando ed incollalo subito."
@@ -871,41 +826,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Esci"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Esci dall'applicazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Tutti i formati"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Esporta in GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Esporta i dati in un file GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Niente da esportare. Prima è necessario ottenere dei dati."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -944,6 +899,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -962,9 +917,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -984,5 +939,5 @@
 msgstr "il parametro ''{0}'' non deve essere nullo"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -990,38 +945,38 @@
 msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Esporta file GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
 msgstr "Storico dell'oggetto"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
 "Visualizza le informazioni dello storico OSM su percorsi, nodi o relazioni."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Informazioni riguardanti l'elemento"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
 "Visualizza le informazioni dell'oggetto OSM su nodi, percorsi o relazioni."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Unisci il nodo al percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Unisci un nodo al percorso più vicino"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Unisci il nodo e il percorso"
@@ -1031,168 +986,186 @@
 msgstr "Nessuna scorciatoia"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Unisci livello"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Unisci il livello corrente con un altro livello"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Fondi nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Unisci i nuovi nodi in quello più vecchio."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Seleziona almeno due nodi da unire."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Interruzione in corso"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "Impossibile unire i nodi. Cancellare un percorso attualmente usato."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Unisci {0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Unisci selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Unisci le primitive attualmente selezionate con un altro livello"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Rispecchia"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Rispecchia i nodi ed i percorsi selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Selezionare almeno un nodo o percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "su"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Sposta oggetti {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "giù"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "sinistra"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "destra"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Muovi {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Sposta Oggetti {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Impossibile spostare degli oggetti fuori dal mondo."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Nuovo"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Crea una nuova mappa."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Apri..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Apri un file."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Apertura dei file in corso"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Apertura del file \"{0}\" in corso..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Apri indirizzo URL..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Apri un indirizzo URL."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Livello separato"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr "Selezionare se i dati devono essere scaricati in un nuovo livello"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Inserisci URL da scaricare:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Inserire un indirizzo URL dal quale devono essere scaricati i dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Scarica indirizzo URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Scarica URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr "Inizio dello scaricamento dei dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "Chiudi la finestra e annulla lo scaricamento"
 
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Scarica dati"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Disponi ortogonalmente"
@@ -1203,18 +1176,18 @@
 "Sposta i nodi in modo che tutti gli angoli compresi siano di 90 o 270 gradi"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 msgid "Orthogonalize Shape / Undo"
 msgstr "Ortogonalizza figura / Annulla"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
 msgid "Undo orthogonalization for certain nodes"
 msgstr "Annulla l'ortogonalizzazione per certi nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr "Ortogonalizza / Annulla"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1226,9 +1199,9 @@
 "ortogonalizzazione figura!"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr "Annulla ortogonalizzazione figura"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1240,36 +1213,37 @@
 "disattivare questo messaggio.<br>Continuare?</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr "Utilizzo"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Gli elementi selezionati non possono essere ortogonalizzati"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Disponi ortogonalmente"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Incolla"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Incolla il contenuto memorizzato"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Incolla le etichette"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Applica le etichette memorizzate a tutti gli elementi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1278,5 +1252,5 @@
 msgstr[1] "Incollo i tag {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1285,59 +1259,59 @@
 msgstr[1] "a {0} primitive"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Preferenze..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Apre una pagina di preferenze per le impostazioni globali."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Rifai"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Rifa l'ultima azione annullata."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Rinomina livello"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Rinomina anche il file"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Impossibile rinominare il file ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Inverti la direzione dei percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Inverti la direzione di tutti i percorsi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Selezionare almeno un precorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Inverti la direzione dei percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1345,10 +1319,10 @@
 msgstr "Salva"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Salva i dati attuali."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1399,21 +1373,21 @@
 msgstr "Salva livello"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Salva come..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Salva i dati correnti su un nuovo file."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Seleziona tutto"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1423,10 +1397,10 @@
 "oggetti incompleti."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Visualizza il rapporto dello stato"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1434,19 +1408,19 @@
 "essere allegate agli errori"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Aiuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Rapporto dello stato"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Copia negli appunti e chiudi"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1455,18 +1429,18 @@
 msgstr "Chiudi"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Dividi percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Divide un percorso al nodo selezionato."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "La selezione attuale non può essere usata per la divisione."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1474,5 +1448,5 @@
 msgstr[1] "I nodi selezionati non sono parte di alcun percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1488,9 +1462,9 @@
 "percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "I nodi selezionati non condividono il medesimo percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1498,10 +1472,10 @@
 msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Seleziona due o più nodi per dividere un percorso circolare."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1533,61 +1507,61 @@
 msgstr "Dividi il percorso {0} in {1} parti"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Visualizza/nascondi le linee GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Disegna le linee tra i punti GPS grezzi."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Attiva o disattiva l''impostazione globale ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Separa percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplica i nodi usati da più percorsi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Questo nodo non è attaccato ad altri elementi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Nessuno di questi nodi è attaccato ad altri elementi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Nessun nodo di questo percorso è attaccato ad altri elementi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "La selezione corrente non può essere utilizzata per la separazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Selezionare uno di questi:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Un nodo etichettato, oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Un nodo che è usato da più di un percorso, oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Un nodo che è in uso da più di un percorso e uno di questi percorsi, oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1596,5 +1570,5 @@
 "oppure"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1603,5 +1577,5 @@
 "percorso."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1616,9 +1590,9 @@
 "e tutti i nodi saranno selezionati."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Nodo staccato"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1626,44 +1600,45 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Duplica {0} nodi in {1} nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Annulla"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Annulla l'ultima azione."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Deseleziona tutto"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Toglie la selezione da tutti gli oggetti."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Deseleziona tutto (al centro)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Deseleziona tutto (al di fuori)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Aggiorna dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
 msgstr ""
 "Aggiorna gli oggetti nel livello corrente dei dati prelevandoli dal server."
@@ -1671,14 +1646,14 @@
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Aggiornamento dei dati"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr "Scarica dati"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Non è stato trovato nessun dataset corrente"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
@@ -1686,9 +1661,9 @@
 "Nell''insieme di dati corrente non è stato trovato un oggetto con id {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Aggiorna le selezioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
@@ -1697,13 +1672,13 @@
 "(scarica nuovamente i dati)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Aggiorna la selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Non c'è alcuna primitiva selezionata per l'aggiornamento."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Selezione vuota"
@@ -1715,8 +1690,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "Carica tutte le modifiche nel livello corrente dei dati sul server OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1727,5 +1703,5 @@
 "necessario risolvere prima questi.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1733,29 +1709,29 @@
 msgstr "Nessun cambiamento da caricare."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Niente da caricare. Prima è necessario ottenere dei dati."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr "Sincronizza solo il nodo {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr "Sincronizza solo il percorso {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Sincronizza solo la relazione {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Sincronizza l'intero dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1778,11 +1754,11 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Rilevati conflitti"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1798,5 +1774,5 @@
 "continuare ad apportare delle modifiche.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1809,24 +1785,22 @@
 "nuovamente con un gruppo di modifiche nuovo o esistente aperto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Gruppo di modifiche chiuso"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Annulla la risoluzione del conflitto"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr "Prepara la risoluzione dei conflitti"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
-#, fuzzy
+msgstr "Cliccare per scaricare tutti i percorsi da cui dipende il nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr "Chiudi questa finestra e ritorna alle modifiche in JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr "Cliccare per annullare e per ritornare alla modifica della mappa"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1836,31 +1810,27 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+"<html>Caricamento <strong>fallito</strong> perché si è tentato di eliminare "
+"il nodo {0} che è ancora utilizzato nel percorso {1}.<br><br>Cliccare "
+"<strong>{2}</strong> per scaricare tutti i percorsi da cui dipende il nodo "
+"{0}.<br>JOSM creerà, se necessario, dei conflitti che potranno essere "
+"risolti nella relativa finestra.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+msgstr "Nodo ancora in uso"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
-"Attenzione: l'intestazione dell'errore {0} non coincideva con lo schema "
-"atteso \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Upload <strong>fallito</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Invio alle API di OSM fallito"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+"Attenzione: la testata dell''errore \"{0}\" non corrisponde ad alcun schema "
+"atteso"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Aggiornamento della primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1869,19 +1839,37 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, fuzzy, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
 msgstr ""
 "Attenzione: la primitiva ''{0}'' è già stata eliminata sul server. Ignorare "
 "questa primitiva e riprovare a caricare."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, fuzzy, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+"Attenzione: la primitiva ''{0}'' è già stata eliminata sul server. Ignorare "
+"questa primitiva e riprovare a caricare."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Caricamento dati ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"L''eccezione verrà ignorata perché lo scaricamento è stato annullato. "
+"Eccezione: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Carica selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "Carica sul server OSM tutte le modifiche nella selezione corrente"
@@ -1900,11 +1888,11 @@
 msgstr "Verifica degli elementi genitori eliminati nell'insieme di dati locale"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Ingrandisci"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Riduci"
@@ -1984,21 +1972,17 @@
 msgstr "Avanzamento lento"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Scaricamento dei dati GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Scarica dati GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Dati GPS grezzi"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Scaricamento dei dati"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -2008,28 +1992,42 @@
 "Eccezione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "Non è stato trovato alcun dato in quest'area."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Dati OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Scaricamento di {0} su {1} ({2} rimanenti)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-"Sono stati generati i seguenti errori durante lo scaricamento massivo:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Errori durante lo scaricamento"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Aggiornamento dei dati"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "visibile (sul server)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+#, fuzzy
+msgid ""
+"Click to check whether objects in your local dataset are deleted on the "
+"server"
+msgstr ""
+"{0} oggetto è stato epurato dall''insieme di dati locale perché risulta "
+"eliminato dal server."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignora"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Cliccare per annullare e per ritornare alla modifica della mappa"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2047,7 +2045,23 @@
 "per ignorare.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Primitive eliminate o spostate"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+"Sono stati generati i seguenti errori durante lo scaricamento massivo:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Errori durante lo scaricamento"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Errori durante lo scaricamento"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2069,5 +2083,5 @@
 msgstr "Modalità: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2098,38 +2112,38 @@
 msgstr "selezionato"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Aggiungi un nodo al percorso e connetti"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Crea un nuovo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Seleziona il nodo sotto il cursore."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2138,14 +2152,14 @@
 msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "Inizia un nuovo percorso dall'ultimo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Continua un percorso dall'ultimo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Termina tracciamento."
@@ -2165,5 +2179,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2178,5 +2192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Rilascia il bottone del mouse per interrompere la rotazione."
@@ -2244,5 +2258,5 @@
 msgstr "Sposta sempre e non visualizzare più la finestra di dialogo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2251,5 +2265,5 @@
 "più vicino."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2262,4 +2276,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zoom"
@@ -2280,5 +2295,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Cerca..."
@@ -2383,20 +2397,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - oggetto con un dato numero di nodi"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - tutti gli oggetti modificati"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - tutti gli oggetti selezionati"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - tutti gli oggetti incompleti"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - tutti gli oggetti provi di proprietà"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2405,5 +2426,5 @@
 "corrispondenti all'espressione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2412,5 +2433,5 @@
 "oggetti corrispondenti all'espressione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2418,5 +2439,5 @@
 "logico ''or''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2424,9 +2445,9 @@
 "contiene :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Utilizzare <b>(</b> e <b>)</b> per raggruppare le espressioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2436,33 +2457,33 @@
 msgstr "Filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Cerca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "Invia filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Inizia Ricerca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nessuna corrispondenza trovata per ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nulla è stato rimosso dalla selezione cercando ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
@@ -2470,18 +2491,18 @@
 "Nella selezione non è stato trovato alcunché durante la ricerca di ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Trovate {0} corrispondenze"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2517,26 +2538,40 @@
 "relazione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Token inaspettato: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Argomenti mancanti per l'operatore booleano OR."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Argomento mancante per l'operatore booleano NOT."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Era attesa una parentesi chiusa."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Numero errato di parametri per operatore sui nodi."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Valore non corretto per l''operatore sui nodi: {0}. L'operatore sui nodi "
+"richiede un numero o un intervallo di nodi, per esempio nodes:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Numero errato di parametri per operatore sui nodi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2547,5 +2582,5 @@
 "richiede un numero o un intervallo di nodi, per esempio nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2651,4 +2686,20 @@
 msgstr "Dipendenze cicliche"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2666,8 +2717,8 @@
 msgstr "Aggiungi relazione {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Epurati {0} oggetti"
+msgstr "Aggiunti {0} oggetti"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2750,5 +2801,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Doppio conflitto"
@@ -2788,4 +2839,15 @@
 msgstr "non è possibile risolvere il conflitto irrisolto"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "il parametro ''{0}'' non deve essere vuoto."
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2816,33 +2878,6 @@
 msgstr[1] "Elimina {0} relazioni"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Conflitto tra relazioni"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Elimina dalla relazione"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\" con ruolo "
-"{2}.<br>Eliminare dalla relazione?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\"."
-"<br>Eliminare dalla relazione?</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Dividi il segmento del percorso"
@@ -2850,6 +2885,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2861,5 +2896,5 @@
 "(che non puoi vedere).<br>Vuoi veramente cancellarli?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Conferma di cancellazione"
@@ -3051,15 +3086,30 @@
 msgstr "Correzione automatica etichette"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Il valore di default è ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Attenzione: è fallita la persistenza delle preferenze su ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Errore di formato nel file di configurazione alla linea {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3070,5 +3120,5 @@
 "delle preferenze ''{0}'' non è in realtà una cartella."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3079,5 +3129,5 @@
 "preferenze ''{0}'' non è in realtà una cartella.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3088,5 +3138,5 @@
 "possibile creare la cartella delle preferenze mancante: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3097,5 +3147,5 @@
 "creare la cartella delle preferenze mancante: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3105,5 +3155,5 @@
 "file di preferenze predefinito."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3114,5 +3164,5 @@
 "file predefinito."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3123,5 +3173,5 @@
 "reimpostare il file delle preferenze con uno predefinito: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3133,5 +3183,5 @@
 "predefinito.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3142,19 +3192,42 @@
 "possibile reimpostare il file delle preferenze con uno predefinito: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferenze salvate in {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Impossibile caricare le preferenze. Motivo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Impossibile scaricare le preferenze dal server."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3165,5 +3238,27 @@
 "L''errore è stato: {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+"Fallito il caricamento dei segnalibri da ''{0}'' per ragioni di sicurezza. "
+"L''errore è stato: {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "SCONOSCIUTO"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3185,20 +3280,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "O"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "E"
@@ -3210,4 +3305,18 @@
 msgid "Changeset {0}"
 msgstr "Gruppo di modifiche {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3274,20 +3383,20 @@
 msgstr "Attenzione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "Era atteso ID >= 0. Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "Una primitiva con ID = 0 non può essere invisibile."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
 msgid "ID > 0 expected. Got {0}."
-msgstr "Atteso ID > 0 . Ottenuto {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+msgstr "Era atteso un ID > 0 . Ottenuto {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3316,6 +3425,6 @@
 "ci sono chiavi con valori multipli."
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3382,113 +3491,113 @@
 msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Il percorso dello stile dell''area non è chiuso."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "il percorso multi-poligonale ''{0}'' non è chiuso."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Eliminato il membro ''{0}'' nella relazione."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Percorso ''{0}'' con meno di due punti."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "E' stato trovato più di un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "E' stato trovato più di un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "E' stata trovata più di una \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ruolo ''{0}'' sconosciuto."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo di membro sconosciuto per ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Non è stato trovato un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Non è stato trovato un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Non è stato trovato alcun nodo o percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Il percorso \"to\" non inizia o finisce su un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Non è stato trovato lo stile per la restrizione {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Il percorso interno ''{0}'' è esterno."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Regola ''{0}'' non utile per il percorso ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-percorso ''{0}'' nel multi-poligono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Nessun percorso esterno per il multi-poligono ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Il percorso interno ''{0}'' è esterno."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3504,11 +3613,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "testo"
+msgstr "testo dell''area"
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3527,5 +3635,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3536,5 +3643,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3563,5 +3669,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "sfondo"
@@ -3595,12 +3701,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Zona di Lambert (Francia)"
+msgstr "Zona di Lambert 4 (Francia)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Zona di Lambert (Francia)"
+msgstr "Zona di Lambert CC9 (Francia)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3636,5 +3740,5 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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>"
@@ -3643,5 +3747,5 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3670,5 +3774,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "ferrovia"
@@ -3685,4 +3789,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3698,33 +3804,33 @@
 msgstr[1] "{0} membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Violazione della precondizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Eccezione di sicurezza"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Eccezione di rete"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "Eccezione di IO"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Errore interno del server"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Richiesta errata"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr "Non trovato"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3732,16 +3838,16 @@
 msgstr "Conflitto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Host sconosciuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr "Oggetto eliminato"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr "Mostra informazioni di aiuto"
@@ -3754,4 +3860,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Scaricamento del \"messaggio del giorno\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Chiudi la finestra"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3821,75 +3932,75 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Nome utente"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "opzioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Mostra questo aiuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Scarica la zona delimitata dal riquadro di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Apri il file (come gps grezzo se .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 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:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Seleziona i risultati della ricerca della stringa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Lancia in modalità massimizzata"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Reimposta le preferenze predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Imposta la lingua."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr "opzioni fornite come proprietà di sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PERCORSO/DELLA/CARTELLA/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 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:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3902,9 +4013,9 @@
 "allocata"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "Esempi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3914,25 +4025,25 @@
 "quindi assicurati di caricare dei dati prima di indicare una selezione."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Invece di --download=<zona> puoi utilizzare osm://<zona>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Attivazione estensioni aggiornate"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Caricamento vecchie estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Impostazioni predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Caricamento estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3947,11 +4058,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3976,6 +4087,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4079,25 +4190,22 @@
 msgstr "(nessun oggetto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "Utente:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "livello non in lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Il livello ''{0}'' deve essere contenuto in una lista di livelli"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Impossibile interpretare"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "File non trovato"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "No, annulla l'operazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4119,5 +4227,5 @@
 msgstr "non settato: non settare questa proprietà sugli oggetti selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4125,49 +4233,48 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125
-#, fuzzy
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
 "relation</strong>.</html>"
 msgstr ""
-"<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong></html>"
+"<html>Confermare per eliminare <strong>1 oggetto</strong> da <strong>1 "
+"relazione</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
 "relations</strong>.</html>"
 msgstr ""
-"<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong></html>"
+"<html>Confermare per eliminare <strong>1 oggetto</strong> da <strong>{0} "
+"relazioni</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
 "relations</strong>.</html>"
 msgstr ""
-"<html>Versione <strong>{0}</strong> creata il <strong>{1}</strong></html>"
+"<html>Confermare per eliminare <strong>{0} oggetti</strong> da <strong>{1} "
+"relazioni</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Elimina {0} oggetto"
-msgstr[1] "Elimina {0} oggetti"
+msgstr[0] "Rimozione di {0} oggetto"
+msgstr[1] "Rimozione di {0} oggetti"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Elimina {0} oggetto"
+msgstr "Elimina oggetti"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "non eliminato"
+msgstr "Da eliminare"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relazione"
+msgstr "Dalla relazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4179,5 +4286,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4188,8 +4295,10 @@
 msgid "Click to close the dialog and remove the object from the relations"
 msgstr ""
+"Cliccare per chiudere la finestra ed eliminare l'oggetto dalle relazioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340
 msgid "Click to close the dialog and to abort deleting the objects"
 msgstr ""
+"Cliccare per chiudere la finestra ed annullare l'eliminazione degli oggetti"
 
 #. *
@@ -4226,5 +4335,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4241,5 +4350,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4463,8 +4572,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4797,6 +4906,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4810,6 +4919,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4869,9 +4978,9 @@
 msgstr "Il loro insieme di dati non include una etichetta con la chiave {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr "Conflitti durante l'unione delle primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
@@ -4879,27 +4988,27 @@
 "Conflitti durante l''unione dei percorsi - il percorso unito è ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, fuzzy, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
 msgstr "Conflitti durante l''unione dei nodi - il nodo unito è ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr "Nessun conflitto da risolvere"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
 msgstr "Annulla la risoluzione del conflitto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
 msgstr "Applica i conflitti risolti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Applica"
@@ -4911,5 +5020,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "tutti"
@@ -5006,4 +5115,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -5014,4 +5125,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -5026,51 +5138,85 @@
 "La posizione {0} è fuori dai limiti. Il numero di membri corrente è {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr "Rimuovi questo membro dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Sostituisci"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-"Sostituisci il percorso a cui fa riferimento questo membro con il percorso "
-"unito"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Rimuovi questo membro dalla relazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr "Non deciso"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr "Non ancora deciso"
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Ruolo:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Imposta un ruolo ai membri selezionati"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#, fuzzy
+msgid "Tag modified relations with "
 msgstr "Etichette modificate assieme alle relazioni   "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
 msgctxt "tag"
 msgid "Key:"
 msgstr "Chiave:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Upload <strong>fallito</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Valore:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "Applica questo ruolo a tutti i membri"
@@ -5109,6 +5255,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5197,10 +5343,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5267,5 +5410,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5310,4 +5454,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Attiva"
@@ -5333,6 +5478,6 @@
 msgstr "Informazioni sul livello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5341,22 +5486,22 @@
 msgstr[1] "Questo cambierà {0} oggetti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Un valore vuoto cancella la chiave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<diverso>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Cambiare i valori?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5365,69 +5510,73 @@
 msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Seleziona una chiave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Seleziona un valore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Seleziona gli oggetti di cui vuoi cambiare le proprietà."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Proprietà/Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Proprietà per gli oggetti selezionati."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Membro di"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Modifica proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Proprietà: {0} / Appartenenze: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Proprietà / Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Elimina dalla relazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, 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/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
@@ -5435,41 +5584,61 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Apri tutte le relazioni in una lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relazioni: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Apri le relazioni selezionate in un editor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Cancella le relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Crea una nuova relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 "Crea una copia di questa relazione e aprila in un'altra finestra dell'editor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr "Imposta la selezione corrente con la lista delle relazioni selezionate"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Cancella le relazioni selezionate"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Selezionare uno di questi:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Scarica le relazioni selezionate"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Scarica i membri"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5496,5 +5665,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5506,9 +5675,9 @@
 msgstr "Selezione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Stacca il pannello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5517,5 +5686,5 @@
 "degli strumenti a sinistra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello"
@@ -5605,5 +5774,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Scarica i membri della relazione"
@@ -5635,5 +5805,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5642,18 +5812,18 @@
 "Eccezione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Etichette e Membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr "Relazioni da cui dipende"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr "Relazioni figlie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5666,14 +5836,14 @@
 "circolari?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr "Rimuovili, ripulisci la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorali, mantieni la relazione com'è"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5686,9 +5856,9 @@
 "aggiungere un altro membro alla relazione?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr "Più membri fanno riferimento alla stessa primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5701,5 +5871,5 @@
 "''''{0}'''' omessa.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5708,5 +5878,5 @@
 "del primo membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5715,5 +5885,5 @@
 "l'ultimo membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5723,5 +5893,5 @@
 "del primo membro selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5731,5 +5901,5 @@
 "l'ultimo membro selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
@@ -5737,10 +5907,10 @@
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor delle relazioni: Rimuovi selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
@@ -5749,5 +5919,5 @@
 "selezione corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5758,67 +5928,69 @@
 "selezione corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr "Seleziona le primitive per i membri della relazione selezionata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Ordina i membri della relazione"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "Editor delle relazioni: Ordina"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Sposta in alto i membri attualmente selezionati"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "Editor delle relazioni: Sposta in alto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Sposta in basso i membri attualmente selezionati"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "Editor delle relazioni: Sposta in basso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr "Rimuovi i membri correntemente selezionati da questa relazione"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "Editor delle relazioni: Rimuovi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr "Elimina la relazione correntemente modificata"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "Si, crea un conflitto e chiudi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Si, crea un conflitto e chiudi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+"Cliccare per creare un conflitto e chiudere questo editor delle relazioni"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "No, continua la modifica"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+"Cliccare per ritornare all'editor delle relazioni e per ripristinare la "
+"modifica della relazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5830,9 +6002,9 @@
 "desidera creare un conflitto e chiudere l'editor?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "Conflitto nei dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5844,41 +6016,41 @@
 "riprovare.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "Applica gli aggiornamenti correnti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Applica gli aggiornamenti e chiudi la finestra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Annulla gli aggiornamenti e chiudi la finestra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Aggiungi una etichetta vuota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Scarica i membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr "Editor delle relazioni: Scarica membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Imposta un ruolo ai membri selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Applica Ruolo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5891,17 +6063,17 @@
 "veramente applicare il nuovo ruolo?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "Si, applica"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "No, non applicare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr "Conferma ruolo vuoto"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5914,5 +6086,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
@@ -5920,10 +6092,10 @@
 "selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 "Ingrandimento disabilitato perché il livello di questa relazione non è attivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr "Ingrandimento disabilitato perché non c'è alcun membro selezionato"
@@ -5937,14 +6109,14 @@
 msgstr "Collegato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr "Scarica le relazioni collegate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr "Era atteso un valore child.getId() > 0. Ottenuto {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5998,60 +6170,91 @@
 "L'eccezione è stata: "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Non connesso"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr "il percorso è connesso"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Ordina i membri della relazione"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr "il percorso è connesso al precedente membro della relazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Ordina i membri della relazione"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr "il percorso è connesso al successivo membro della relazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+"il percorso non è connesso al precedente o al successivo membro della "
+"relazione"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Segnalibri"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Per prima cosa inserisci le coordinate della località."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#, fuzzy
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "Attualmente non ci sono changeset aperti."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Creazione confine"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Modifica la relazione correntemente selezionata"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Inserisci il nome della località."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr "Nome della posizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Per prima cosa, scegli un segnalibro."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Sposta in alto i membri attualmente selezionati"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Sposta in alto i membri attualmente selezionati"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "Lat min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "Lon min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "Lat max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "Lon max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -6061,22 +6264,74 @@
 "indirizzo URL qui per scaricare l'area)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Riquadro di selezione"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Sorgenti di dati e tipi"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Dati OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Divide un percorso al nodo selezionato."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Dati GPS grezzi"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Il percorso selezionato non contiene il nodo selezionato."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Scarica come nuovo layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Area da scaricare"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Scarica"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Nessuna relazione selezionata"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -6084,359 +6339,66 @@
 "dal server"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Area da scaricare corretta, sarà probabilmente accettata dal server"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+"Cliccare per chiudere la finestra ed annullare l'eliminazione degli oggetti"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Modifica la relazione correntemente selezionata"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Scegli la riga da modificare."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Inserire il nome di un luogo da cercare:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Inserire il nome di un luogo da cercare:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 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:168
-msgid "Please enter a search string"
-msgstr "Inserire la stringa da cercare"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Impossibile leggere dal server i risultati della ricerca del luogo"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Inserire il nome di un luogo da cercare:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Luoghi"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "nome"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "tipo"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "vicino a"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "livello di ingrandimento"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-"<b>Ingrandimento:</b> rotellina del mouse, doppio click oppure Ctrl + Su/giu "
-"<b>Spostamento della mappa:</b> tenere premuto il tasto destro del mouse, "
-"muovere il mouse o utilizzare i tasti cursore. <b>Selezione:</b> tenere "
-"premuto il tasto sinistro del mouse e disegnare un riquadro."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Slippy map"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "livello di zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "coordinata x di partenza"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "a"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "coordinata y di partenza"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Numeri dei tasselli"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-"Fallita la lettura del file CSS ''help-browser.css''. L''eccezione è: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr "Browser dell'aiuto di JOSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>Fallita l''apertura della connessione al server remoto<br>''''{0}''''."
-"<br>Controllare la propria connessione ad internet.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr "Apri la pagina di aiuto corrente in un browser esterno"
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr "Modifica la pagina di aiuto corrente"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr "Ricarica la pagina di aiuto corrente"
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr "Vai alla pagina precedente"
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr "Vai alla pagina successiva"
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr "Vai alla pagina iniziale di aiuto a JOSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
 #, fuzzy
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-"Attenzione: fallita la lettura del messaggio del giorno da ''''{0}''''. "
-"L''eccezione è stata: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Search ..."
+msgstr "Cerca..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
 #, fuzzy
-msgid "Failed to open help page"
-msgstr "Ricarica la pagina di aiuto corrente"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-"Fallita la lettura del comando. Uscita dal browser di aiuto. L'eccezione è "
-"stata:"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr "Fallita l'apertura del browser esterno di aiuto"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr "Latitudine: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr "Longitudine: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr "Coordinate"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "Storico per il nodo {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "Storico per il percorso {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "Storico per la relazione {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Chiudi la finestra"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr "Ricarica lo storico dal server"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"Storico non ancora inizializzato. Fallita l'impostazione della primitiva di "
-"riferimento."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-"Fallita l''impostazione del riferimento. Il riferimento con ID {0} non "
-"corrisponde allo storico con ID {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-"Fallita l''impostazione del riferimento. Il riferimento con versione {0} non "
-"è disponibile nello storico."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-"storico non ancora inizializzato. E' fallito il tentativo di impostare la "
-"primitiva corrente."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-"Fallita l''impostazione della primitiva corrente. La versione corrente {0} "
-"non è disponibile nello storico."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Carica storico"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr "Era atteso un oggetto con id > 0. Ottenuto {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr "Caricamento dello storico per il nodo {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr "Caricamento dello storico per il percorso {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr "Caricamento dello storico per la relazione {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Nodo {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Percorso {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relazione {0}"
+msgid "Click to start searching for places"
+msgstr "Direzione di ricerca della terraferma"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6793,4 +6755,6 @@
 #. 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" />
@@ -7171,6 +7135,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7236,11 +7201,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7250,6 +7215,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7259,79 +7224,382 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Tipo"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "vicino a"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+"<b>Ingrandimento:</b> rotellina del mouse, doppio click oppure Ctrl + Su/giu "
+"<b>Spostamento della mappa:</b> tenere premuto il tasto destro del mouse, "
+"muovere il mouse o utilizzare i tasti cursore. <b>Selezione:</b> tenere "
+"premuto il tasto sinistro del mouse e disegnare un riquadro."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Slippy map"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "livello di zoom"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "coordinata x di partenza"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "a"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "coordinata y di partenza"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Numeri dei tasselli"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+"Fallita la lettura del file CSS ''help-browser.css''. L''eccezione è: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr "Browser dell'aiuto di JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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\">Manca il contenuto per questo argomento di "
+"aiuto</p><p class=\"warning-body\">Il contenuto per l''argomento di aiuto "
+"<strong>{0}</strong> non è ancora disponibile. Manca per la propria lingua "
+"locale ({1}) e anche per la lingua inglese.<br><br>Aiutateci a migliorare il "
+"sistema di aiuto JOSM e a inserire le informazioni mancanti. Si può "
+"modificare l''argomento di aiuto <a href=\"{2}\">nella propria lingua locale "
+"({1})</a> oppure <a href=\"{3}\">nella lingua inglese</a>.</p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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\">Errore durante l''ottenimento delle "
+"informazioni di aiuto</p><p class=\"error-body\">Il contenuto per "
+"l''argomento di aiuto <strong>{0}</strong> non può essere caricato. Il "
+"messaggio di errore è (non tradotto):<br><tt>{1}</tt></p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+"<html>Fallita l''apertura della pagina di aiuto per l''indirizzo url {0}."
+"<br>Tipicamente questo è dovuto a qualche problema di rete, controllare la "
+"propria<br>connessione ad internet</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr "Fallita l'apertura dell'indirizzo URL"
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr "Apri la pagina di aiuto corrente in un browser esterno"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr "Modifica la pagina di aiuto corrente"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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>L''indirizzo URL corrente <tt>{0}</tt><br>è un indirizzo URL esterno. "
+"Le modifiche sono possibili solamente per gli argomenti di aiuto<br>sul "
+"server di aiuto <tt>{1}</tt>.</html>"
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr "Ricarica la pagina di aiuto corrente"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr "Vai alla pagina precedente"
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr "Vai alla pagina successiva"
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr "Vai alla pagina iniziale di aiuto a JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr "Attenzione: posizione errata nel documento HTML. L'eccezione è stata: "
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+"Fallita l'apertura della pagina di aiuto. L'indirizzo URL di destinazione è "
+"vuoto."
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr "Fallita l'apertura della pagina di aiuto"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+"Fallita la lettura del comando. Uscita dal browser di aiuto. L'eccezione è "
+"stata:"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr "Fallita l'apertura del browser esterno di aiuto"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr "Latitudine: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr "Longitudine: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr "Coordinate"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "Storico per il nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "Storico per il percorso {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "Storico per la relazione {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Chiudi la finestra"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr "Ricarica lo storico dal server"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+"Storico non ancora inizializzato. Fallita l'impostazione della primitiva di "
+"riferimento."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+"Fallita l''impostazione del riferimento. Il riferimento con ID {0} non "
+"corrisponde allo storico con ID {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+"Fallita l''impostazione del riferimento. Il riferimento con versione {0} non "
+"è disponibile nello storico."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+"storico non ancora inizializzato. E' fallito il tentativo di impostare la "
+"primitiva corrente."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+"Fallita l''impostazione della primitiva corrente. La versione corrente {0} "
+"non è disponibile nello storico."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Carica storico"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr "Era atteso un oggetto con id > 0. Ottenuto {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr "Caricamento dello storico per il nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr "Caricamento dello storico per il percorso {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr "Caricamento dello storico per la relazione {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Percorso {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relazione {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Utente"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr "Insieme di modifiche"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7415,4 +7683,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr "Lancia una finestra di selezione file"
@@ -7733,6 +8002,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0} oggetto da modificare:"
@@ -7837,5 +8106,16 @@
 msgstr "Era atteso un insieme di modifiche con ID > 0. Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"Attenzione: la primitiva ''{0}'' è già stata eliminata sul server. Ignorare "
+"questa primitiva e riprovare a caricare."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr "Preparazione delle primitive da caricare ..."
@@ -7869,59 +8149,59 @@
 msgstr "Continua il caricamento"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Immagini per {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Leggi GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lettura di {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Non è stata trovata nessuna immagine con una data leggibile."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lettura di {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Immagini geoetichettate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS inizio: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS fine: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "differenza attuale: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "differenza fuso orario: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7929,51 +8209,51 @@
 msgstr[1] "immagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} in questa traccia."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Sincronizza tempo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Immagini JPEG (*.jpeg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Impossibile leggere la data nel file \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Orario non presente nei dati EXIF del file \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Immagine"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Fuso orario del GPS (differenza rispetto alle foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Sincronizza l'orario con l'unità GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Impossibile decodificare l'orario inserito."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7981,30 +8261,30 @@
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizza disegno linee"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usa le impostazioni globali."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Disegna le linee tra i punti di questo livello."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Non disegnare le linee tra i punti di questo livello."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Seleziona le opzioni per il disegno delle linee"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -8012,5 +8292,5 @@
 msgstr "Personalizza colori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -8019,5 +8299,5 @@
 msgstr "Predefinito"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -8026,43 +8306,43 @@
 msgstr "Scegli un colore"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Crea marcatori dai punti con nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Nomina i punti del percorso da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importa l'audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Files audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcatori audio da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importa immagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Descrizione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -8072,28 +8352,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr "Differenza temporale"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "Lunghezza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "Indirizzo URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Lunghezza: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -8102,5 +8382,5 @@
 msgstr[1] "{0} percorsi, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -8109,10 +8389,10 @@
 msgstr[1] "{0} punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Converti in livello dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -8123,11 +8403,11 @@
 "tracciati, vedere qui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -8137,29 +8417,29 @@
 msgstr "Convertito da: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Scarica da OSM lungo questo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Scarica tutto entro:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Area massima per richiesta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km quadrati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -8170,13 +8450,9 @@
 "vuole procedere?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr "Scarica dati"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Nessuna traccia GPX da associare con l'audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8187,5 +8463,5 @@
 "all'inizio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8195,19 +8471,19 @@
 "tracciato per poter essere giustamente calcolati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Livello dati {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "al di fuori dell'area scaricata"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "versione {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
@@ -8215,5 +8491,5 @@
 "nella versione 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8222,12 +8498,13 @@
 msgstr[1] "Sono stati individuati {0} conflitti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, fuzzy, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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} oggetto è stato epurato dall''insieme di dati locale perché risulta "
@@ -8238,29 +8515,47 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
+#, fuzzy, 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] ""
 "Consultare la finestra con la lista dei conflitti<br>e risolverli "
 "manualmente."
-
+msgstr[1] ""
+"Consultare la finestra con la lista dei conflitti<br>e risolverli "
+"manualmente."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Chiudi questa finestra e ritorna alle modifiche in JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} eliminati)"
+msgstr[1] " ({0} eliminati)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} è composto da:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} eliminati)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "disattiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "Versione delle API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8432,6 +8727,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8446,6 +8739,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8638,5 +8929,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8773,5 +9064,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
-msgstr "Solo sull''estremità di un percorso."
+msgstr "Solo sull'estremità di un percorso."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
@@ -8962,5 +9253,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:42
 msgid "Modeless working (Potlatch style)"
-msgstr "Lavoro senza modalità di editing (Stile Potlatch)"
+msgstr "Lavora senza modalità di editing (stile Potlatch)"
 
 #. Show localized names
@@ -8981,5 +9272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:58
 msgid "Default (Auto determined)"
-msgstr "Predefinito (determinato automaticamente)"
+msgstr "Predefinita (determinata automaticamente)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:65
@@ -8987,21 +9278,20 @@
 msgstr "Lingua"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Abilita lo stile predefinito 'incorporato'"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 msgid "Enable built-in icon defaults"
 msgstr "Abilita le icone predefinite incorporate"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+msgid "Used style"
+msgstr "Stile usato"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
 msgid "Map Paint Styles"
 msgstr "Stili di disegno della mappa"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
-msgid "Used style"
-msgstr "Stile usato"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -9015,6 +9305,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Aggiorna"
@@ -9170,70 +9459,107 @@
 msgstr "Scorciatoia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Attiva"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr "Percorso Icone"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Breve descrizione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "Indirizzo URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "Autore: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Pagina internet: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Versione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr "Percorso Icone"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Copia predefiniti"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Selezionare la riga da copiare."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-"La sorgente XML (indirizzo URL o nome di file) per i file di definizione di "
-"{0}."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr "Aggiungi una nuova sorgente XML alla lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Elimina la sorgente selezionata nella lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr "Predefiniti (vedere il suggerimento per informazioni dettagliate)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Elimina le voci selezionate dalla lista degli elementi uniti"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "Elimina le voci selezionate dalla lista degli elementi uniti"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Aggiungi una nuova etichetta"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Chiudi i gruppi di modifiche aperti selezionati"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Modifica la sorgente selezionata."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Caricamento dello storico per il nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Fallito il caricamento o lo scaricamento dei dati "
+"da<br>''''{0}''''<br>a causa di un problema con il loro trasferimento."
+"<br>Dettagli (non tradotti): {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, fuzzy, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr "Valore non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Ordina il menu dei preimpostati"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9441,5 +9767,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Ulteriori informazioni su questa caratteristica"
@@ -9504,16 +9830,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Gruppo di preimpostazioni \"{0}\""
+msgstr "Gruppo preimpostato {1} / {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Gruppo di preimpostazioni \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr "Gruppo preimpostato {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9521,5 +9847,5 @@
 msgstr "Collegamento al server OSM in corso..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9630,5 +9956,5 @@
 msgstr "Analisi del file \"{0}\" fallita"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -9872,5 +10198,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9901,5 +10227,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9907,5 +10233,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9920,5 +10246,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9929,33 +10255,33 @@
 msgstr "Analisi della lista degli insiemi di modifiche..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Nome utente o password errati."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Attenzione: la password è trasferita non cifrata."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Salva nome utente e password (non cifrata)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Inserire la password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "L'URL di base per il server OSM (API REST)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Nome di accesso (e-mail) al profilo OSM."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9964,17 +10290,17 @@
 "password."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "URL di base per il server"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "Nome utente OSM (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "Password OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -10089,5 +10415,5 @@
 msgstr "il file \"{0}\" non esiste"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -10098,5 +10424,5 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
@@ -10104,10 +10430,10 @@
 "<way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "Attributo obbligatorio ''''{0}'''' mancante su <nd> del percorso {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
@@ -10116,5 +10442,5 @@
 "{0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
@@ -10122,10 +10448,10 @@
 "dell'elemento <relation>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Attributo ''''ref'''' mancante sul membro nella relazione {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
@@ -10134,10 +10460,10 @@
 "{0}. Ottenuto {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Attributo ''''tipo'''' mancante sul membro {0} nella relazione {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -10147,9 +10473,9 @@
 "relazione {1}. Ottenuto {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "<member> incompleto, specificazione con ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
@@ -10158,10 +10484,10 @@
 "ingresso. Omesso."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Oggetto illegale con id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -10172,7 +10498,11 @@
 "ID {0}. Ottenuto {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -10184,20 +10514,20 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Versione delle API sconosciuta o non supportata. Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "Attributo ''''versione'''' mancante sulla primitiva OSM con ID {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "Manca l''attributo obbligatorio ''''{0}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
@@ -10205,5 +10535,5 @@
 "Valore lungo non valido per l''attributo ''''{0}''''. Ottenuto ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -10213,5 +10543,5 @@
 "esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -10222,5 +10552,5 @@
 "almeno un nodo nei dati caricati."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -10230,5 +10560,5 @@
 "esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -10239,13 +10569,13 @@
 "con ID esterno ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Preparazione dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr "Analisi dei dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr "Preparazione dell'insieme di dati..."
@@ -10256,14 +10586,13 @@
 msgstr "Era atteso un parametro ID ''''{0}'''' > 0. Ottenuto ''''{1}''''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Scarica da OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr "Scaricamento da server OSM..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr "scaricamento dei percorsi collegati ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr "Scaricamento delle relazioni collegate ..."
@@ -10388,15 +10717,15 @@
 "differenziale."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Aggiorna estensioni"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Scarica Estensioni"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10409,30 +10738,34 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "L'estensione {0} è stata scaricata con successo. Riavviare JOSM."
 msgstr[1] ""
 "Le estensioni {0} sono state scaricate con successo. Riavviare JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Scaricamento estensione {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Salta il download"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Scarica estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Salta scaricamento"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10444,5 +10777,5 @@
 msgstr "E' stato generato un errore dall'estensione {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -10451,5 +10784,5 @@
 "non è più necessaria."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10462,52 +10795,61 @@
 "<br>Dovrebbe essere disabilitata.<br>Rimuovere dalle preferenze?</html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr ""
+"L''ultimo aggiornamento della lista delle estensioni è avvenuto più di {0} "
+"giorni fa."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Aggiorna estensioni"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
-msgstr "Il plugin {0} è richiesto dal plugin {1} ma non è stato trovato"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+msgstr ""
+"L''estensione {0} è richiesta dall''estensione {1}, ma non è stata trovata."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Estensione non trovata: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr ""
-"L''ultimo aggiornamento della lista delle estensioni è avvenuto più di {0} "
-"giorni fa."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Si può modificare il numero di giorni dopo il quale appare questo "
-"avvertimento<br>specificando l'opzione di configurazione 'pluginmanager."
-"warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Non è possibile caricare il plugin {0}. Cancellarlo dalle preferenze?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Disabilita estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Mantieni estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10517,9 +10859,9 @@
 "i permessi per sovrascrivere quelle esistenti."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10529,10 +10871,10 @@
 "dall'estensione ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Secondo le informazioni all'interno del plugin l'autore è {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10541,9 +10883,9 @@
 "comunicare un bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Disabilitare l'estensione?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10553,23 +10895,23 @@
 "eliminare l'estensione."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 "L''estensione non può essere rimossa. Probabilmente è stata già disabilitata"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Informazioni sull''estensione"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "nessuna descrizione disponibile"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Maggiori dettagli"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10578,18 +10920,18 @@
 msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Non è stata trovata alcuna informazione sulle estensioni."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "L''estensione con nome {0} non è disponibile. Aggiornamento ignorato."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Tutte le estensioni sono state aggiornate."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10602,9 +10944,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Scarica le estensioni mancanti"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10619,9 +10961,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10643,19 +10985,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versione {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Estensioni fornite con JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10722,5 +11064,5 @@
 msgstr "(Il testo è stato già copiato nei tuoi appunti)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10732,5 +11074,5 @@
 "propria connessione ad internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10742,5 +11084,5 @@
 "server dopo un intervallo massimo di attesa.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10753,5 +11095,5 @@
 "{1}, rimuovere il riferimento alla relazione {0}, e riprovare.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10763,10 +11105,10 @@
 "usato<br>viola una precondizione.<br>Il messaggio di errore é:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr "Fallita l''analisi della data ''{0}'' restituita dal server."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10777,5 +11119,5 @@
 "strong><br>perché è stato già chiuso.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10786,18 +11128,18 @@
 "strong><br>perché è stato già chiuso il {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
-#, java-format
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
+#, fuzzy, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
+"(untranslated):<br>{0}</html>"
 msgstr ""
 "<html>Il server riporta che è stato trovato un conflitto.<br>Messaggio "
 "d''errore (non tradotto):<br>{0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>Il server riporta che è stato trovato un conflitto.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10811,5 +11153,5 @@
 "caricata da ''''{1}''''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10820,5 +11162,5 @@
 "<br>Controllare la propria connessione ad internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10830,5 +11172,5 @@
 "<br>Dettagli (non tradotti): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10840,10 +11182,10 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "Il server OSM ''''{0}'''' ha riportato una richiesta non corretta.<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10856,10 +11198,10 @@
 "OSM."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Messaggio di errore (non tradotto): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10875,5 +11217,5 @@
 "''''{0}'''' per identificare eventuali errori di battitura."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10887,5 +11229,5 @@
 "ad internet.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10901,5 +11243,5 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10933,4 +11275,6 @@
 "''{0}''. Using default code ''en''."
 msgstr ""
+"Attenzione: fallita la derivazione del prefisso della lingua di riferimento "
+"dal codice JOSM ''{0}''. Utilizzo del codice predefinito ''en''."
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
@@ -11023,13 +11367,4 @@
 "La preferenza con chiave ''''{0}'''' non esiste. Non è possibile "
 "ripristinare la geometria della finestra dalle preferenze."
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
-msgstr ""
-"Attenzione: fallito il ripristino della geometria della finestra dalla "
-"chiave ''''{0}''''. Ritorno alla geometria predefinita. Dettagli: {1}"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -11180,5 +11515,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -11194,10 +11530,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Dispari"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -11205,59 +11541,59 @@
 msgstr "Pari"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr "Alfabetico"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr "Relazione: {0}"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr "Associa alla strada utilizzando:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr "Schema della numerazione:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr "# iniziale:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr "# finale:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr "Assocerà {0} nodi supplementari per la numerazione degli edifici"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr "Città:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr "Stato:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr "Codice postale:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr "Nazione:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr "Indirizzo completo:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr "Informazioni aggiuntive:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
@@ -11265,30 +11601,30 @@
 "indirizzi"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 "Selezionare un percorso di interpolazione degli indirizzi per questa strada"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr "Erano attesi numeri dispari per gli indirizzi"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr "Erano attesi numeri pari per gli indirizzi"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr "Il codice della nazione deve essere composto da 2 lettere"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr "Inserire un numero valido per l'indirizzo iniziale e finale"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr "Un indirizzo alfabetico deve terminare con una lettera"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
@@ -11296,17 +11632,17 @@
 "alfabetici"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr "La lettera iniziale dell'indirizzo deve essere minore di quella finale"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr "Inserire un numero valido per l'indirizzo iniziale"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr "Inserire un numero valido per l'indirizzo finale"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr "Il numero iniziale dell'indirizzo deve essere minore di quello finale"
@@ -11360,46 +11696,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Estrazione delle localizzazioni GPS dagli EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Inizio analisi cartella"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Uno dei file selezionati è nullo !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Lettura delle foto ..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Non è possibile ottenere il percorso canonico per la cartella {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Analisi cartella {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Trovato un file nullo nella cartella {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Errore durante il prelevamento dei file dalla cartella {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Correlazione ai dati GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11666,5 +12003,5 @@
 msgstr "Errore nel file {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11680,10 +12017,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr "Seleziona Feuille"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11733,13 +12070,13 @@
 msgstr "Scegliere da..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Catasto"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Sorgente auto-determinata"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11752,13 +12089,13 @@
 "Si desidera ripristinare F11 per l'azione di cattura ?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr "Ripristino della scorciatoia F11 di cattura"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM si è fermato in attesa che il cambiamento abbia effetto."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11883,7 +12220,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Visualizza le coordinate come"
+msgstr "Mostra trasversali:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11903,5 +12239,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11944,13 +12280,13 @@
 msgstr "Creazione confine"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr "Connessione al WMS del catasto ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr "Immagine già caricata"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -12007,4 +12343,6 @@
 "Do you want to use them ?"
 msgstr ""
+"Questa immagine contiene dei dati di georeferenziazione.\n"
+"Si desidera utilizzarli?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:169
@@ -12073,5 +12411,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:32
 msgid "Set manually the Lambert zone"
-msgstr ""
+msgstr "Imposta manualmente la zona di Lambert"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43
@@ -12090,24 +12428,24 @@
 #, java-format
 msgid "{0} not allowed with the current projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+msgstr "{0} non ammesso con la proiezione corrente"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Cambia posizione"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Imposta una nuova posizione per la prossima richiesta"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Aggiungi un nuovo livello"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Posizione"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -12117,5 +12455,5 @@
 "punteggiatura conosciuta da www.cadastre.gouv.fr .</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Aggiungi un nuovo livello"
@@ -12129,9 +12467,9 @@
 msgstr "Ottieni un nuovo cookie (sessione scaduta)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr "File PNG (*.png)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr "Esporta in formato PNG (solo immagini raster)"
@@ -12154,9 +12492,11 @@
 msgstr "Regola la posizione del livello WMS (solo immagini non vettoriali)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
 "a cadastre \"plan image\" (raster image)"
 msgstr ""
+"Questa modalità funziona solamente se il livello attivo è\n"
+"una \"immagine piatta\" (immagine raster) del cadastre"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
@@ -12176,5 +12516,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Livello vuoto"
@@ -12203,5 +12543,5 @@
 msgstr "Riquadro del comune: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -12212,9 +12552,9 @@
 "Crearne uno nuovo."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Errore nel formato della cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -12223,9 +12563,9 @@
 "corrente"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Errore nella zona di Lambert della cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -12235,4 +12575,8 @@
 "manually the Lambert zone from the Cadastre menu"
 msgstr ""
+"Il livello corrente è all''interno della zona di Lambert CC9 \"{0}\"\n"
+"dove il comune è all''interno della zona di Lambert CC9 \"{1}\".\n"
+"Caricare le proprie modifiche, chiudere tutti i livelli e cambiare\n"
+"manualmente la zona di Lambert dal menu Cadastre"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
@@ -12323,5 +12667,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Nessun dato caricato."
@@ -12730,7 +13074,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "acqua"
@@ -12946,11 +13290,11 @@
 msgstr "Livello LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Cattura traccia GPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
@@ -12958,22 +13302,22 @@
 "LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Centra una volta"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centra il livello LiveGPS sulla posizione corrente."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Centratura automatica"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centra continuamente il livello LiveGPS sulla posizione corrente."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -13067,25 +13411,25 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr "Crea multi-poligono"
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr "Crea multi-poligono."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 "Uno dei percorsi selezionati appartiene già ad un altro multi-poligono."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr "Il multi-poligono deve consistere solamente in percorsi chiusi."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr "Selezionare almeno due percorsi."
@@ -13243,4 +13587,9 @@
 msgstr "Eseguibile di Firefox"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Layer"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -13291,30 +13640,30 @@
 msgstr "Azioni permesse"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Il controllo remoto ha richiesto il caricamento dei dati dalle API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Dettagli della richiesta: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Si vuole permettere questo?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Conferma l'azione del controllo remoto"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr "il controllo remoto ha richiesto la creazione di un nuovo nodo."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -13335,7 +13684,5 @@
 msgstr "Nessuna relazione selezionata"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -13344,4 +13691,5 @@
 #: ../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 "Navigazione"
@@ -13363,25 +13711,25 @@
 msgstr "Apri un elenco dei nodi dell'itinerario"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
 msgstr "Aggiungi un livello di navigazione"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Criteri"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "Più breve"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "Più rapido"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Inverti il percorso"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Cancella l'itinerario"
@@ -13411,93 +13759,87 @@
 msgstr "Inserire i valori di peso"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Auto zoom: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Carica il tassello"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "Mostra lo stato dei tasselli"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Richiesta di aggiornamento"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Mostra informazioni"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Carica tutti i tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Aumenta l'ingrandimento"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Diminuisci l'ingrandimento"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr "Svuota la cache dei tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "immagine "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "autozoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "carica automaticamente i tasselli"
 
 #. 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Impostazioni per l'estensione SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Sorgenti dei tasselli"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Auto zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Carica utomaticamente i tasselli: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Massimo livello di zoom: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Massimo livello di zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Smorza lo sfondo: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "errore nel caricamento dei metadati"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr "errore nella richiesta di aggiornamento: non a zoom-level 12"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "richiesta: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "errore nella richiesta di aggiornamento"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -13510,5 +13852,5 @@
 msgstr "Salva ogni minuto su file i dati acquisiti."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13677,5 +14019,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nome Strada"
@@ -13723,5 +14065,5 @@
 msgstr "Seleziona almeno un percorso chiuso che dovrebbe essere unito."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
@@ -13729,25 +14071,25 @@
 "modifica."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Nodo aggiunto su tutte le intersezioni"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Elimina i percorsi che non fanno parte di un multi-poligono interno"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Correggi le relazioni"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "L'area auto-sovrapposta è stata unita"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Le aree sovrapposte sono state unite"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13757,33 +14099,33 @@
 "favore verifica che non siano stati introdotti errori."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Inserire dei valori per tutti i conflitti."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Risolvi conflitti"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Correggi i conflitti di etichette"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Sono stati rimossi elementi dalle Relazioni"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Unisi Aree: Elimina le way corte"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Strada chiusa (anello)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Rimuovi i tag dalle way interne"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Funzione di unione delle Aree"
@@ -14001,8 +14343,4 @@
 msgstr "Correggi gli errori selezionati."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignora"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -14047,25 +14385,24 @@
 msgstr "Sostituisci \"{0}\" con \"{1}\" per"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Linee di costa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Questo controllo analizza che le linee di costa siano corrette."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
-msgstr "Linea di costa senza ordinamento"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Linea di costa senza ordinamento"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+msgid "Unconnceted coastline"
+msgstr "Linea di costa non connessa"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Linea di costa senza ordinamento"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr "Linea di costa invertita"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -14089,19 +14426,19 @@
 msgstr "Percorsi incrociati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Nodi duplicati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 "Questo controllo verifica che non ci siano due nodi nella stessa posizione."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Nodi nella stessa posizione"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Conferma"
@@ -14366,4 +14703,8 @@
 msgstr "Modifica la sorgente selezionata."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Elimina la sorgente selezionata nella lista."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14583,7 +14924,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "building"
@@ -14597,5 +14938,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "area"
@@ -14605,26 +14946,26 @@
 msgstr "Percorso non chiuso"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Percorsi non connessi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Questo controllo verifica se una via finisce molto vicina ad un'altra via."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Nodo finale del percorso vicino ad altra strada"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Nodo finale del percorso vicino ad altro percorso"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Nodo del percorso vicino ad altro percorso"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Nodo finale della strada collegata vicino ad un'altra strada"
@@ -14727,22 +15068,26 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
-#, fuzzy
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr "Walking Papers: {0}"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr "Walking Papers"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "Selezionare un nodo iniziale alla fine di un percorso"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "E' stata raggiunta la fine della linea"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "E' stato raggiunto un incrocio"
@@ -15016,9 +15361,9 @@
 msgstr "Errore nel formato del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Apri un livello WMS vuoto per caricare i dati da file"
@@ -15533,6 +15878,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Riferimento"
@@ -16094,5 +16439,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr "metallo"
@@ -16104,5 +16449,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "bosco"
@@ -16390,7 +16735,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "si"
@@ -16539,8 +16884,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "no"
@@ -16667,31 +17012,4 @@
 msgstr "Modifica un incrocio"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Tipo"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16812,5 +17130,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "residential"
@@ -16845,5 +17163,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "service"
@@ -16878,5 +17196,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "construction"
@@ -17266,12 +17584,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operatore"
@@ -17484,6 +17802,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Elevazione"
@@ -17910,5 +18228,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "palude alluvionale"
@@ -18441,25 +18759,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Orario di apertura"
@@ -18525,24 +18843,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr "24/7"
@@ -18555,24 +18873,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Ve 08:30-20:00"
@@ -18585,24 +18903,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
@@ -18635,6 +18953,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Numero di riferimento"
@@ -18650,5 +18968,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "sotterraneo"
@@ -18662,5 +18980,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Tariffa"
@@ -18896,5 +19214,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Pensilina/ricovero"
@@ -19362,5 +19680,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -19375,5 +19693,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Sci"
@@ -19527,16 +19845,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Sito archeologico"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Modifica sito archeologico"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Memoriale"
@@ -19544,55 +19875,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Pietra limite"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Modifica pietra limite"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Parco giochi"
@@ -19600,35 +19931,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Articoli sportivi"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -19642,6 +19973,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "seleziona uno sport:"
@@ -20033,30 +20364,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "sport"
@@ -20066,227 +20397,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "tiro con l'arco"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "sport_equestri"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football_americano"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
+
+#. 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 "tipo"
 
 #. item "Sport/Multi" combo "type"
@@ -20323,203 +20707,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "campo_sportivo"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "centro_sportivo"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadio"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "tracciato"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Tiro con l'arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Modifica tiro con l'arco"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Sport motoristici"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Modifica Sport Motoristici"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
@@ -20527,56 +20911,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -20584,182 +20968,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sport (Pallone)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Modifica football"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Modifica Rugby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Artificiale"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Edifici"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Palazzo"
@@ -20767,5 +21151,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -20773,10 +21157,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Municipio"
@@ -20784,10 +21168,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Modifica municipio"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -20795,10 +21179,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -20807,10 +21191,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Prigione"
@@ -20819,10 +21203,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polizia"
@@ -20832,10 +21216,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -20844,10 +21228,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -20855,5 +21239,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
@@ -20861,15 +21245,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Asilo"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Modifica Asilo"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Scuola"
@@ -20877,10 +21261,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Modifica Scuola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Università"
@@ -20888,10 +21272,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Modifica Università"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Scuola superiore"
@@ -20899,5 +21283,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Modifica Scuola superiore"
@@ -20905,5 +21289,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cinema"
@@ -20912,10 +21296,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Biblioteca"
@@ -20924,9 +21308,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -20934,10 +21318,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Modifica centro d'arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teatro"
@@ -20946,10 +21330,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -20959,5 +21343,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
@@ -20966,6 +21350,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religione"
@@ -20974,66 +21358,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahaismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "induismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "giainismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "unitariano"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastrismo"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Denominazione"
@@ -21042,81 +21426,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "sciismo"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunnismo"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Indirizzi"
@@ -21125,5 +21509,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Modifica dati indirizzo"
@@ -21131,5 +21515,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Numero civico"
@@ -21137,20 +21521,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nome Casa"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Codice nazione"
@@ -21159,5 +21543,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Modifica interpolazione indirizzo"
@@ -21165,61 +21549,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabetico"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Artificiale"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Tipo di torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "telecomunicazioni"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "osservazione"
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Altezza (metri)"
@@ -21227,25 +21611,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Faro"
@@ -21253,10 +21637,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -21264,10 +21648,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -21276,37 +21660,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "petrolio"
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "liquami"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "calore"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "qualunque sostanza"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "subacqueo"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "sopra il suolo"
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -21316,10 +21700,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Gru permanente"
@@ -21327,10 +21711,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Torre radio"
@@ -21338,10 +21722,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -21349,10 +21733,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -21360,5 +21744,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
@@ -21366,5 +21750,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -21374,35 +21758,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -21411,10 +21795,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -21423,5 +21807,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
@@ -21429,10 +21813,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Riferimento linea"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -21443,23 +21827,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr "traliccio"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr "palo"
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr "Riferimento torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Linea elettrica"
@@ -21468,75 +21852,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Modifica linea elettrica"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr "Tipo di linea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr "linea"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr "linea minore"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Tensione"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr "Quantità di cavi"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Numero di fili (conduttori) per cavo elettrico"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr "singola"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr "doppia"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr "tripla"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr "quadrupla"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Bagni"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefono"
@@ -21545,5 +21929,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
@@ -21551,5 +21935,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Monete"
@@ -21557,5 +21941,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Note"
@@ -21563,5 +21947,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
@@ -21569,5 +21953,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Carte di debito"
@@ -21575,15 +21959,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -21592,5 +21976,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
@@ -21598,35 +21982,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Vestiti"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Panchina"
@@ -21635,31 +22019,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr "Schienale"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr "pietra"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr "plastica"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr "Colore"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr "nero"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr "marrone"
@@ -21730,40 +22114,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "verde"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr "rosso"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr "blu"
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "erba"
-
-#: build/trans_presets.java:2470
+msgstr "grigio"
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr "bianco"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr "Quantità di posti"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
@@ -21772,30 +22155,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Nascondi"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Blocco"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Fontana"
@@ -21804,10 +22187,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -21816,10 +22199,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -21827,33 +22210,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr "Farmacista"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr "Modifica farmacista"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Minimarket"
@@ -21861,9 +22244,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Modifica minimarket"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -21871,27 +22254,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Modificia Chiosco"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr "Libreria"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr "Modifica libreria"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "Agenzia di viaggi"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "Modifica agenzia di viaggi"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -21899,5 +22282,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Modifica Distributore automatico"
@@ -21905,88 +22288,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Distributore automatico"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "Biglietti trasporto pubblico"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "Orari trasporto pubblico"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "Biglietti per il parcheggio"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "Alimenti"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "Bevande"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "Dolci"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "Sigarette"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "Cibo per animali"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "Giornali"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "Schede SIM"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "buoni_telefonici"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "Sacchetto per escrementi"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Macellaio"
@@ -21994,9 +22377,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Modifica Macellaio"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Panificio"
@@ -22004,9 +22387,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Modifica Panificio"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Fiorista"
@@ -22014,18 +22397,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Modifica Fiorista"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Prodotti biologici"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Alcolici (non in Italia)"
@@ -22033,54 +22416,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Modifica negozio di alcolici (non in Italia)"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Bevande"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Modifica negozio di bevande"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Elettronica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Modifica Negozio di Elettronica"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Modifica negozio di Hi-Fi"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Mobilia"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Giardinaggio"
@@ -22088,9 +22471,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Modifica giardinaggio"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Ferramenta"
@@ -22098,9 +22481,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Modifica Negozio di Ferramenta"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
@@ -22108,54 +22491,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifica negozio Fai-da-te"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Cartoleria"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Calzature"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Giocattoli"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Videoteca"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
@@ -22163,9 +22546,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Modifica Lavanderia a secco"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -22173,9 +22556,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Modifica lavanderia"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Sport all'aperto"
@@ -22183,28 +22566,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Modifica sport all'aperto"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Ottico"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Contanti"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Banca"
@@ -22212,14 +22595,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Modifica banca"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Bancomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -22227,5 +22610,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Modifica cambiavalute"
@@ -22233,15 +22616,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Modifica bancomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Salute"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -22249,18 +22632,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Modifica ambulatorio"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -22268,5 +22651,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Modifica Farmacia"
@@ -22274,9 +22657,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Ospedale"
@@ -22284,10 +22667,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Modifica Ospedale"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -22296,5 +22679,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Modifica Colonnina SOS"
@@ -22303,20 +22686,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -22324,5 +22707,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -22331,59 +22714,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr "Geografia"
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Luoghi"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Nazione"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Modifica nazione"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Regione"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Provincia"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
@@ -22391,15 +22779,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Città"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Paese"
@@ -22407,10 +22795,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Modifica paese"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Sobborgo"
@@ -22418,25 +22806,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Modifica Sobborgo"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Frazione"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Modifica Frazione"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Modifica Borgo"
@@ -22444,5 +22832,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Luogo che ha un nome, ma non popolato"
@@ -22450,10 +22838,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Località"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Isola"
@@ -22461,10 +22849,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Modifica isola"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr "Isoletta"
@@ -22472,5 +22860,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr "Modifica isoletta"
@@ -22478,5 +22866,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -22484,10 +22872,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Modifica entrata di una grotta/caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -22495,10 +22883,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Modifica picco montuoso"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -22506,10 +22894,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Modifica Ghiacciaio"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Vulcano"
@@ -22517,70 +22905,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Modifica vulcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Confini"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Nazionale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Politico"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Albero"
@@ -22589,15 +22977,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Modifica albero singolo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Bosco"
@@ -22606,5 +22994,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Modifica bosco"
@@ -22612,17 +23000,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "Conifere"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Foresta"
@@ -22631,14 +23019,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Modifica area di foresta"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
@@ -22646,25 +23034,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Ghiaione"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Modifica Ghiaione"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Boscaglia"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Fell"
@@ -22672,10 +23060,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Modifica Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Brughiera"
@@ -22683,5 +23071,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Modifica brughiera"
@@ -22689,5 +23077,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Aia"
@@ -22696,45 +23084,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Prato"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -22743,25 +23131,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Giardino"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Erba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Village Green"
@@ -22769,10 +23157,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Common (UK)"
@@ -22780,20 +23168,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Modifica una Common (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Parco"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -22801,5 +23189,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
@@ -22807,15 +23195,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Residential Landuse"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Modifica Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -22823,9 +23211,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -22833,39 +23221,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -22873,15 +23261,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Militare"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -22889,55 +23277,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Ridestinazione d'uso"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d'uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Cava"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -22947,5 +23335,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
@@ -22954,10 +23342,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "segmento esterno"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "segmento interno"
@@ -22965,5 +23353,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -22972,5 +23360,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
@@ -22978,34 +23366,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -23014,15 +23402,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "verso il percorso"
@@ -23030,5 +23418,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Percorso"
@@ -23037,5 +23425,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Modifica un percorso"
@@ -23043,5 +23431,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Tipo di percorso"
@@ -23113,5 +23501,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -23120,17 +23508,17 @@
 msgstr "bicicletta"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "sci"
@@ -23183,5 +23571,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -23190,13 +23578,13 @@
 msgstr "pedone"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "escursionismo"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "deviazione"
@@ -23210,10 +23598,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -23221,31 +23609,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Rete"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr "Stato del percorso"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -23254,30 +23642,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "segmento di percorso"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
@@ -23715,11 +24103,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "deprecato"
@@ -25743,5 +26131,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "acqua (chiaro)"
@@ -26413,4 +26801,12 @@
 #.
 #. <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"/>
@@ -26435,5 +26831,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "attrazione storica"
@@ -26447,5 +26843,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "cava/miniera"
@@ -26459,5 +26855,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "discarica"
@@ -26479,5 +26875,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "bacino"
@@ -26491,5 +26887,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "foresta"
@@ -26503,5 +26899,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "aia"
@@ -26524,5 +26920,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "area commerciale (negozi)"
@@ -26536,5 +26932,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "industriale"
@@ -26548,5 +26944,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "ridestinazione d'uso"
@@ -26560,5 +26956,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
@@ -26572,5 +26968,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "area ferroviaria"
@@ -26627,7 +27023,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "militare"
@@ -26641,5 +27037,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "cimitero"
@@ -26652,5 +27048,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "picco montuoso"
@@ -26665,5 +27061,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "ghiacciaio"
@@ -26677,5 +27073,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "vulcano"
@@ -26730,8 +27126,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "elemento naturale"
@@ -26745,5 +27141,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "boscaglia"
@@ -26757,5 +27153,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "brughiera"
@@ -26769,8 +27165,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "area"
+msgstr "area boschiva non gestita"
 
 #. color water
@@ -26782,5 +27177,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
@@ -26794,5 +27189,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "spiaggia"
@@ -26870,8 +27265,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "percorso"
@@ -26919,7 +27314,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "confine"
@@ -27069,11 +27464,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "luogo"
@@ -27121,6 +27516,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "indirizzo"
@@ -27428,57 +27823,127 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Errore durante il caricamento della pagina {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Pagina di help mancante. Creala in <A HREF=\"{0}\">italiano</A>."
+#~ msgid "File could not be found."
+#~ msgstr "Impossibile trovare il file."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Selezionare almeno un compito per scaricare"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Invio alle API di OSM fallito"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Conflitto tra relazioni"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">inglese</A> oppure "
-#~ "<A HREF=\"{1}\">nella propria lingua</A>."
+#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\" con ruolo "
+#~ "{2}.<br>Eliminare dalla relazione?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>La selezione \"{0}\" è utilizzata dalla relazione \"{1}\"."
+#~ "<br>Eliminare dalla relazione?</html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Impossibile interpretare"
+
+#~ msgid "File not found"
+#~ msgstr "File non trovato"
+
+#~ msgid "Replace"
+#~ msgstr "Sostituisci"
+
+#~ msgid "Replace the way this member refers to with the combined way"
+#~ msgstr ""
+#~ "Sostituisci il percorso a cui fa riferimento questo membro con il "
+#~ "percorso unito"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Per prima cosa inserisci le coordinate della località."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Per prima cosa, scegli un segnalibro."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Inserire la stringa da cercare"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Impossibile leggere dal server i risultati della ricerca del luogo"
+
+#~ msgid "name"
+#~ msgstr "nome"
+
+#~ msgid "zoom"
+#~ msgstr "livello di ingrandimento"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Copia predefiniti"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Selezionare la riga da copiare."
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr ""
+#~ "La sorgente XML (indirizzo URL o nome di file) per i file di definizione "
+#~ "di {0}."
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Aggiungi una nuova sorgente XML alla lista."
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "Predefiniti (vedere il suggerimento per informazioni dettagliate)"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Si può modificare il numero di giorni dopo il quale appare questo "
+#~ "avvertimento<br>specificando l'opzione di configurazione 'pluginmanager."
+#~ "warntime'.)"
+
+#~ msgid ""
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
+#~ msgstr ""
+#~ "Attenzione: fallito il ripristino della geometria della finestra dalla "
+#~ "chiave ''''{0}''''. Ritorno alla geometria predefinita. Dettagli: {1}"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Mostra lo stato dei tasselli"
+
+#~ msgid "Request Update"
+#~ msgstr "Richiesta di aggiornamento"
+
+#~ msgid "error loading metadata"
+#~ msgstr "errore nel caricamento dei metadati"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "errore nella richiesta di aggiornamento: non a zoom-level 12"
+
+#~ msgid "requested: {0}"
+#~ msgstr "richiesta: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "errore nella richiesta di aggiornamento"
+
+#~ msgid "No data imported."
+#~ msgstr "Nessun dato importato."
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Ricarica la lista di selezione"
+
+#~ msgid "Data Layer"
+#~ msgstr "Livello dati"
+
+#~ msgid "Email"
+#~ msgstr "Email"
 
 #~ msgid "Can only edit help pages from JOSM Online Help"
 #~ msgstr ""
 #~ "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Usa la preimpostazione ''{0}''"
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "Gruppo di preimpostati ''''{0}'''' del gruppo ''''{1}''''"
-
-#~ msgid ""
-#~ "Plugin {0} version {1} found but for this version of JOSM is at least "
-#~ "version {2} required. Please update the plugin."
-#~ msgstr ""
-#~ "E'' stata trovata la versione {1} dell''estensione {0} ma per questa "
-#~ "versione di JOSM è richiesta almeno la versione {2}. Aggiornare "
-#~ "l''estensione."
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr ""
-#~ "Impostare manualmente la zona di Lambert (per posizioni incluse tra due "
-#~ "zone)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Aprire prima un livello (GPX, OSM, cache)"
-
-#~ msgid "No data imported."
-#~ msgstr "Nessun dato importato."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Ricarica la lista di selezione"
-
-#~ msgid "Data Layer"
-#~ msgstr "Livello dati"
-
-#~ msgid "Email"
-#~ msgstr "Email"
 
 #~ msgid "Move"
@@ -27583,7 +28048,4 @@
 #~ msgstr "Username OSM (email)"
 
-#~ msgid "Aborting..."
-#~ msgstr "Interruzione in corso"
-
 #~ msgid "Unknown version"
 #~ msgstr "Versione sconosciuta"
@@ -27608,4 +28070,7 @@
 #~ msgid "Merge nodes with different memberships?"
 #~ msgstr "Unire i nodi con diffenti appartenenze?"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Errore durante il caricamento della pagina {0}"
 
 #~ msgid "Open in Browser"
@@ -27675,4 +28140,7 @@
 #~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
 
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Usa la preimpostazione ''{0}''"
+
 #~ msgid "Combine ways with different memberships?"
 #~ msgstr "Unire i percorsi con diverse appartenenze?"
@@ -27693,4 +28161,7 @@
 #~ msgid "rectifier id={0}"
 #~ msgstr "identificativo rectifier={0}"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
 
 #~ msgid "Tagging preset sources"
@@ -27940,4 +28411,12 @@
 #~ msgstr "Pubblico"
 
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Aprire prima un livello (GPX, OSM, cache)"
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr ""
+#~ "Impostare manualmente la zona di Lambert (per posizioni incluse tra due "
+#~ "zone)"
+
 #~ msgid ""
 #~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
@@ -28271,7 +28750,4 @@
 #~ "e continuare?"
 
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Attualmente non ci sono changeset aperti."
-
 #~ msgid "Close current changeset"
 #~ msgstr "Chiude il changeset corrente"
@@ -28287,4 +28763,14 @@
 #~ "il changeset dopo il caricamento"
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Pagina di help mancante. Creala in <A HREF=\"{0}\">italiano</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">inglese</A> oppure "
+#~ "<A HREF=\"{1}\">nella propria lingua</A>."
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Pagina di aiuto mancante. Crearla in <A HREF=\"{0}\">italiano</A>."
@@ -28341,2 +28827,13 @@
 #~ msgid "MIddle way: {0}"
 #~ msgstr "Percorso intermedio: {0}"
+
+#~ msgid "Preset group ''{0}'' of group ''{1}''"
+#~ msgstr "Gruppo di preimpostati ''''{0}'''' del gruppo ''''{1}''''"
+
+#~ msgid ""
+#~ "Plugin {0} version {1} found but for this version of JOSM is at least "
+#~ "version {2} required. Please update the plugin."
+#~ msgstr ""
+#~ "E'' stata trovata la versione {1} dell''estensione {0} ma per questa "
+#~ "versione di JOSM è richiesta almeno la versione {2}. Aggiornare "
+#~ "l''estensione."
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 18273)
+++ applications/editors/josm/i18n/po/ja.po	(revision 18508)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-18 14:58+0000\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-06 03:46+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:07+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "不正な形式のURLの\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,14 +98,14 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "不正な形式のファイルURL\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
@@ -119,13 +113,12 @@
 "<html>ファイル ''{0}'' が読み込めません。<br> エラー内容: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -133,23 +126,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -157,5 +151,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -164,21 +158,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -187,5 +182,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -198,17 +193,9 @@
 msgstr "エラー"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "不明"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "情報"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "情報を表示する。"
@@ -216,37 +203,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMapエディタ"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "バージョン{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../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:141
+#: ../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:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "ホームページ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "バグ報告"
@@ -256,5 +243,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -262,33 +249,29 @@
 msgstr "情報"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "はじめにお読みください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "リビジョン"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "貢献"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "ライセンス"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "JOSMについて"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "ファイルは存在しませんでした。"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -325,42 +308,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -368,5 +350,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -381,19 +363,19 @@
 "さい。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "対象のレイヤーを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "対象のレイヤーを選択する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "マージ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -404,50 +386,50 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "対象のレイヤーがありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "ノードを追加..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "緯度経度を指定して、ノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "編集: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "新しいノードの座標を入力してください"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "十進経緯度を使う。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "負の値は、西半球（西経）または南半球（南緯）を意味します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -456,5 +438,5 @@
 msgstr "緯度"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -463,27 +445,27 @@
 msgstr "経度"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../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:36
+#: ../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:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -493,5 +475,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -507,30 +489,28 @@
 msgstr "ツール: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../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:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -540,84 +520,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../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:32
+#: ../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:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "少なくとも3つのノードを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "データ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "レイヤー"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "ダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "{0}へズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "{0}のビューへズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "表示: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "ズームする対象が選択されていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "ズームの対象になる競合はありません"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "開かれた変更セットを閉じます"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "開かれた変更セットを閉じます"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -625,37 +605,37 @@
 msgstr "ファイル: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "開かれた変更セットはありません"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "開かれた変更セットはありません"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "開かれた変更セットをダウンロード中 ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../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:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "複数のウェイを一つに結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "方向を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "逆転して結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -663,5 +643,5 @@
 msgstr "ウェイは現在の方向で結合できません。一方の方向にそろえますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -670,41 +650,41 @@
 "ウェイを結合できません（これらをノードの一列として統合することができません）"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0}ウェイを結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "結合するウェイを少なくとも二つ選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "コピー"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "選択したオブジェクトをペースト用バッファにコピーします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "円形を作成"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "選ばれた3つのノードから円形を作成します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "これらのノードは、円の中にありません。中止します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -714,16 +694,14 @@
 "つのウェイ、を選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -735,5 +713,5 @@
 msgstr "削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "選択したオブジェクトを削除します"
@@ -741,6 +719,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -754,74 +732,51 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../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:30
+#: ../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:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "OSMからダウンロード..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "地図データをOSMサーバからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "ダウンロード"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "ダウンロードするタスクを少なくとも一つ選んでください。"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr "親のウェイ/リレーションをダウンロード..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 "選択したプリミティブの一つを参照しているプリミティブをダウンロードします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr "ID > 0 が必須です。入力値 {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, fuzzy, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "ID > 0 である必要があります。 {0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -830,39 +785,39 @@
 msgstr "パラメータの ''{0}'' はヌルではいけません"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "インポートした内容には {0} の競合があります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "ダウンロード中に競合"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) プリミティブ {2} の親要素をロード中"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr "({0}/{1}) ノード {2} の親をロード中"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) プリミティブ {2} の親要素をロード中"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr "({0}/{1}) ウェイ {2} の親をロード中"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) プリミティブ {2} の親要素をロード中"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr "({0}/{1}) リレーション {2} の親をロード中"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "複製"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "コピー後すぐに貼り付けで複製"
@@ -872,41 +827,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "アプリケーションを終了します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "全てのフォーマット"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "GPXにエクスポート..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "データをGPXファイルにエクスポートします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "エクスポートするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -945,6 +900,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -963,9 +918,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -985,5 +940,5 @@
 msgstr "パラメータ ''{0}'' はヌルであってはなりません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -993,36 +948,36 @@
 "''{0}''。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "GPX ファイルをエクスポート"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../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:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../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:16
+#: ../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/JoinNodeWayAction.java:29
 #: ../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:29
+#: ../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:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "ノードと線をつなぐ"
@@ -1032,169 +987,187 @@
 msgstr "ショートカットなし"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "レイヤーを結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "ノードの結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "一番古いものにノードをマージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "結合する少なくとも二つのウェイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "中止します..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "ノードを結合できません：使用しているウェイを削除しないとけなくなります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "{0}ノードを結合する"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../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:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../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:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "選択したノードやウェイの鏡像を作ります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "少なくとも1つはノードかウェイを選んでください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "上"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "オブジェクト{0}を移動"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "下"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "左"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "右"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "{0} を移動"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "オブジェクトの移動 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "オブジェクトを世界の外に移動できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "新規"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "新しい地図を作成します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "開く..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "ファイルを開く"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "ファイルを開いています"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "ファイル ''{0}''を開いています ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "URL を開く。"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "レイヤーに分ける"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr "新しいレイヤーにデータをダウンロードするなら選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "ダウンロードするURLの入力:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../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:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "ダウンロード先"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "ダウンロードURL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr "データダウンロード開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "ダイアログを閉じてダウンロードをキャンセル"
 
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "データのダウンロード"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "直交した形状"
@@ -1204,18 +1177,18 @@
 msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1224,9 +1197,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1238,37 +1211,38 @@
 "て見てください。<br>続けますか?</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "垂直化"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "貼り付け"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "貼り付けバッファの内容を貼り付け"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../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:32
+#: ../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:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1276,5 +1250,5 @@
 msgstr[0] "{0} タグを貼り付けています"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1282,59 +1256,59 @@
 msgstr[0] "{0} プリミテブまで"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "設定..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "全体の設定のページを開きます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "設定"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "最後に取り消した操作を再度行います。"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "ファイル名も変える"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../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/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "ウェイ方向反転"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "選択したウェイ全ての方向を反転します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "少なくとも１つのウェイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "ウェイ方向反転"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1342,10 +1316,10 @@
 msgstr "保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "最新データを保存します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1396,21 +1370,21 @@
 msgstr "レイヤーを保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "名前をつけて保存..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "現在のデータを新規ファイルに保存"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "すべて選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1420,28 +1394,28 @@
 "ジェクトも選択します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "状況報告を見る"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr "バグに添付できる有用な情報と一緒にステータスレポートを表示する"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "ヘルプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "状況報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "クリップボードにコピーして閉じる"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1450,23 +1424,23 @@
 msgstr "閉じる"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "ウェイを分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "選択したノードでウェイを分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "現在の選択は分割できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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] "選択したノードは、いずれかのウェイの中間ではありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1479,20 +1453,20 @@
 "てください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "選択したノードは同じウェイで共有されていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
 msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "円形につながったウェイの分割には、二つ以上のノードを選択する必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1523,60 +1497,60 @@
 msgstr "ウェイ{0}を{1}こに分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../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:15
+#: ../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:15
+#: ../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:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "ウェイを引き離す"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "複数のウェイに使われているノードを複製します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "このノードは、他のどれとも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "どのノードも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "どのウェイも接着していません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "現在の選択は引き離せません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "ほかを選択："
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* 1つのタグのついたノード、または"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* 1つ以上のウェイに使われている1つのノード, または"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* 1つ以上のウェイに使われている1つのノードとそのウェイの1つ, または"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1584,5 +1558,5 @@
 "* 1つ以上のウェイに使われている1つ以上のノードを持つ1つのウェイ, または"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1590,5 +1564,5 @@
 "* 1つのウェイと、1つより多いウェイに使われている1つ以上のそのウェイのノード。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1603,9 +1577,9 @@
 "コピーが作られ、全てのノードが選択状態になります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "ノードを引き離す"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1613,67 +1587,68 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "{0}ノードを{1}ノードと見なす"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "最後の操作を取り消します"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "選択なし"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "全てのオブジェクトで選択解除"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "全てを選択解除(Focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "全てを選択解除（Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "データを更新"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+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:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "データ更新中"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr "データのダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "現在のデータセットが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr "現在のデータセットには ID {0} のオブジェクトがありません"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "選択を更新"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
@@ -1681,13 +1656,13 @@
 "サーバから（再ダウンロードデータ）現在選択されたオブジェクトを更新します"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "選択を更新"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "更新用に選択されたプリミティブがありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "選択は空です"
@@ -1699,8 +1674,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "現在のデータレイヤーの変更を全てOSM サーバにアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1711,5 +1687,5 @@
 "さい。</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1717,29 +1693,29 @@
 msgstr "アップロードする変更はありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr "ノード {0} だけを同期"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr "ウェイ {0} だけを同期"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "リレーション {0} だけを同期"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "データセット全体を同期"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1761,11 +1737,11 @@
 "してください。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "競合が検出されました"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1781,5 +1757,5 @@
 "さい。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1792,24 +1768,22 @@
 "に開いている変更セットをアップロードしてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "変更セットは閉じられました"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "競合解決をキャンセル"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr "競合解決の準備"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
-#, fuzzy
+msgstr "クリックしてノード {0}用の全ての親ウェイをダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr "ダイアログを閉じてJOSMでの編集に戻る"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr "クリックしてキャンセル後に地図編集を再開"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1819,29 +1793,24 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+"<html>アップロード <strong>失敗</strong> ウェイ {1} が使用中のノード {0} を削"
+"除しようとしました。<br><br><strong>{2}</strong> をクリックしてノード {0} の"
+"全ての親ウェイをダウンロードしてください。<br>必要ならJOSM は競合解決ダイアロ"
+"グで解決できる競合として作成します。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+msgstr "ノードはまだ使用中です"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "警告: エラーヘッダ \"{0}\" は期待されたパターン {1} に一致しません"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>アップロード <strong>失敗</strong>。<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "OSM API へのアップロード失敗"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+msgstr "警告: エラーヘッダ \"{0}\" は想定されたパターンに一致しません"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "プリミティブ更新中"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1850,19 +1819,35 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, fuzzy, 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/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, fuzzy, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+"警告: プリミティブの ''{0}''  は既にサーバから削除されています。このプリミ"
+"ティブをスキップし、アップロードを再試行します。"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "データアップロード中 ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "選択をアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "現在の選択の変更を全てOSMサーバにアップロード"
@@ -1881,11 +1866,11 @@
 msgstr "ローカルデータセット内の削除済みの親をチェック中"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "拡大"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "ズームアウト"
@@ -1965,21 +1950,17 @@
 msgstr "ゆっくり再生"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "GPSデータをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "ダウンロードされたGPXデータ"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "生のGPSデータ"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "データをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1987,27 +1968,42 @@
 msgstr "ダウンロードがキャンセルされたので例外を無視します。例外の内容: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "この範囲ではデータは見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMapデータ"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "ダウンロード {1}のうち{0} (残り {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "次のエラーが一括ダウンロード中に発生しました: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "ダウンロード中にエラーです。"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "データ更新中"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "表示(サーバ上)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+#, fuzzy
+msgid ""
+"Click to check whether objects in your local dataset are deleted on the "
+"server"
+msgstr ""
+"{0} 個のオブジェクトはサーバから削除されましたので、ローカルなデータセットか"
+"ら放棄されました。"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "無視する"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "クリックしてキャンセル後に地図編集を再開"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2024,7 +2020,22 @@
 "るには、<strong>{2}</strong>をクリックしてください。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "削除または移動されたプリミティブ"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "次のエラーが一括ダウンロード中に発生しました: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "ダウンロード中にエラーです。"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "ダウンロード中にエラーです。"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2046,5 +2057,5 @@
 msgstr "モード: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2074,38 +2085,38 @@
 msgstr "選択済の"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 msgid "Add node"
 msgstr "ノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "ウェイのノードを追加して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "新規ノードの作成"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "カーソルの下のノードを選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2113,14 +2124,14 @@
 msgstr[0] "新規ノードを {0}このウェイに追加します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "新規ウェイを最後に操作したノードから開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "最後に操作したノードからウェイを継続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "描画の完了"
@@ -2140,5 +2151,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
@@ -2149,5 +2160,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "回転を止めるには、マウスボタンを放します。"
@@ -2211,5 +2222,5 @@
 msgstr "常に移動し、ダイアログ表示は不要"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2218,5 +2229,5 @@
 "マージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2228,4 +2239,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "ズーム"
@@ -2245,5 +2257,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "検索..."
@@ -2347,42 +2358,49 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - 指定されたノード番号のオブジェクト"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>変更済み</b> - 変更されたオブジェクトすべて"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>選択</b>- 選択されたオブジェクトすべて"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>不完全</b> - すべての不完全なオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>タグなし</b> - すべてのタグなしオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 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:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 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:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 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:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "<b>\"</b> を演算子をくくるために使ってください。（例：キーが：を含む)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2392,51 +2410,51 @@
 msgstr "フィルター"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "検索"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "フィルターを登録"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "検索開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "\"{0}\"にマッチするものが見つからない"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "''{0}'' を探しましたがセレクションの中には見つかりませんでした"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} の一致が見つかりました"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2472,26 +2490,40 @@
 "\"relation\"です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "予想外のトークン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "orに引数がありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "not に引数がありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "閉じ括弧があるはずです。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "間違った数のパラメータが、ノード演算子に渡されました。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"不正なノード演算子の値: {0}。ノード演算子はノードの数や範囲で指定してくださ"
+"い、例えば ノード: 10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "間違った数のパラメータが、ノード演算子に渡されました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2502,5 +2534,5 @@
 "い、例えば ノード: 10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2604,4 +2636,20 @@
 msgstr "循環依存"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2619,8 +2667,8 @@
 msgstr "リレーション {0} を追加"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "{0} 個のオブジェクトを取り除いた。"
+msgstr "{0} オブジェクトを追加しました"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2702,5 +2750,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "二重の競合"
@@ -2740,4 +2788,15 @@
 msgstr "未決の競合を解決できません"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "パラメータ ''{0}'' は空以外でなければなりません"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2764,33 +2823,6 @@
 msgstr[0] "{0} のリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "競合中のリレーション"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "関連から削除"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されています。"
-"<br>リレーションから削除しますか?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレーショ"
-"ンから削除しますか？</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "ウェイのセグメントを分割"
@@ -2798,6 +2830,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2809,5 +2841,5 @@
 "起こします。<br>本当に削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "削除確認"
@@ -2994,15 +3026,30 @@
 msgstr "自動タグ修正"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "既定値は \"{0}\"です。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "警告: プレセットの設定を ''{0}''とするのに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "不正な設定がファイルの{0}行目にあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3013,5 +3060,5 @@
 "ありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3022,5 +3069,5 @@
 "ではありません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3030,5 +3077,5 @@
 "警告: 設定を初期化するのに失敗しました。作成に失敗した設定ディレクトリ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3039,5 +3086,5 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3047,5 +3094,5 @@
 "す。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3055,5 +3102,5 @@
 "警告: 既存の設定ファイル ''{0}'' をデフォルトの設定ファイルで置き換えます。"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3064,5 +3111,5 @@
 "トできません</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3073,5 +3120,5 @@
 "<br>に取って、新しい初期設定ファイルを作ります。</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3082,19 +3129,42 @@
 "に失敗"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "設定は{0}に保存"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "設定をアップロードできませんでした。理由: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "サーバから設定をロードできませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3105,5 +3175,27 @@
 "の内容: {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+"''{0}'' からのブックマークのロードはセキュリティ上の理由で失敗しました。例外"
+"の内容: {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "不明"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3125,20 +3217,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "南"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "北"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "西"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "東"
@@ -3150,4 +3242,18 @@
 msgid "Changeset {0}"
 msgstr "変更セット {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3214,14 +3320,14 @@
 msgstr "Warning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "id=0 のプリミティブは非表示にできません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3229,5 +3335,5 @@
 msgstr "ID > 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3259,6 +3365,6 @@
 "す。"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3319,113 +3425,113 @@
 msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "領域を指定するウェイが閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "マルチポリゴンのウェイ \"{0}\"は閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "メンバー \"{0}\"を関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "ウェイ\"{0}\"は二つ未満のポイントです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "二つ以上の\"from\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "二つ以上の\"to\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "経由地が複数有ります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明なロール\"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "{0}のメンバーのタイプが不明"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "\"from\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "\"to\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "経由地かウェイが見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"to\"のウェイは\"via\"のノードで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"from\" のウェイは\"via\"のウェイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"to\"のウェイは\"via\"のウェイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "制約条件{0}のスタイルがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "ウェイ \"{0}\"と\"{1}\"の交差する点"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "内部のウェイ ''{0}''が外側にあります。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "ウェイ \"{0}\"と\"{1}\"の交差する点"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "内部のウェイ ''{0}''が外側にあります。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3441,11 +3547,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "テキスト"
+msgstr "エリアテキスト"
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3464,5 +3569,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3472,5 +3576,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3497,5 +3600,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "背景"
@@ -3529,12 +3632,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "ランベルトゾーン（フランス）"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "ランベルトゾーン（フランス）"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3570,5 +3671,5 @@
 msgstr "UTM20N (仏領)マルティニーク海外県 Fort Desaix 市 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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>"
@@ -3576,5 +3677,5 @@
 "<html>''{0}''<br>からブックマークが読み込めません<br>エラー内容: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3603,5 +3704,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "鉄道"
@@ -3618,4 +3719,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3629,33 +3732,33 @@
 msgstr[0] "{0} メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "前提条件違反"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "セキュリティ例外"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "ネットワーク例外"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "IO 例外"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "サーバの内部エラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "不正な要求"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr "見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3663,16 +3766,16 @@
 msgstr "競合"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "不明なホスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr "オブジェクトは削除されました"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr "ヘルプ情報を表示"
@@ -3685,4 +3788,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "\"今日のメッセージ\"をダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "ダイアログを閉じる"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3752,74 +3860,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "ユーザ名"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "パスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "オプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "このヘルプの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "標準のunix配置引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "bounding boxをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "ファイルを開く（.gpxの場合生のGPSとして)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "bounding boxを生GPSとしてダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "検索から選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "設定を既定に戻します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "言語の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr "Javaシステムのプロパティとして提供されるオプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr "全てのユーザ設定用フォルダを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3831,9 +3939,9 @@
 "     Javaの使用メモリ最大サイズを増やすオプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3843,25 +3951,25 @@
 "読み込まれることにご注意ください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "--download=<bbox>のかわりに osm://<bbox>を指定できます。\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "アップデートしたプラグインの活性化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "プラグインのロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3874,11 +3982,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3903,6 +4011,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4005,25 +4113,22 @@
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "ユーザ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "レイヤーがリストにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "レイヤー ''{0}'' はレイヤーのリスト中になければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "解析中にエラー"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "ファイルが見つかりません"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "いいえ、操作をキャンセルします"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4044,5 +4149,5 @@
 msgstr "変更なし：この設定値を選択したオブジェクトに対して更新しませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4050,48 +4155,47 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125
-#, fuzzy
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
 "relation</strong>.</html>"
 msgstr ""
-"<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
+"<html><strong>1 オブジェクト</strong> を<strong>1 リレーション</strong> から"
+"削除して良いか確認してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
 "relations</strong>.</html>"
 msgstr ""
-"<html>バージョン <strong>{0}</strong> 作成日 <strong>{1}</strong></html>"
+"<html><strong>1 オブジェクト</strong> を<strong>{0} リレーション</strong> か"
+"ら削除して良いか確認してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131
-#, fuzzy, java-format
+#, 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>"
+"<html><strong>{0} オブジェクト</strong> を<strong>{1} リレーション</strong> "
+"から削除して良いか確認してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "{0} のオブジェクトを削除"
+msgstr[0] "{0} オブジェクトを削除中"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "{0} のオブジェクトを削除"
+msgstr "オブジェクトを削除"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "削除されていません"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "関連"
+msgstr "リレーションから"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4103,5 +4207,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4111,9 +4215,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327
 msgid "Click to close the dialog and remove the object from the relations"
-msgstr ""
+msgstr "クリックしてダイアログを閉じ、オブジェクトをリレーションから削除"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340
 msgid "Click to close the dialog and to abort deleting the objects"
-msgstr ""
+msgstr "クリックしてダイアログを閉じ、オブジェクト削除を中断"
 
 #. *
@@ -4150,5 +4254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4165,5 +4269,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4373,8 +4477,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4694,6 +4798,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4707,6 +4811,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4765,36 +4869,36 @@
 msgstr "相手のデータセットはキー {0} を持つタグを含みません"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr "プリミティブの連結時に競合"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr "ウェイの連結時に競合 - 連結されたウェイは''{0}'' です"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, fuzzy, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
 msgstr "ノードの結合時に競合 - 結合されたノードは''{0}'' です"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr "解決が必要な競合はありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "適用"
@@ -4806,5 +4910,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "全て"
@@ -4895,4 +4999,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4902,4 +5008,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4912,49 +5019,85 @@
 msgstr "pos {0} は、範囲外です。現在のメンバーの数: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr "このリレーションメンバーをこのリレーションから除きます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "置換"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "このリレーションメンバーをこのリレーションから除きます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr "未決定"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr "未決定です"
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "ロール:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "選択されたメンバーにロールをセット"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#, fuzzy
+msgid "Tag modified relations with "
 msgstr "タグは、次のものでリレーションを変更しました:   "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../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 ""
+
+#: ../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:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>アップロード <strong>失敗</strong>。<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "値:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "全てのメンバーにこのロールを適用"
@@ -4991,6 +5134,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5077,10 +5220,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5147,5 +5287,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5192,4 +5333,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "有効化"
@@ -5215,6 +5357,6 @@
 msgstr "レイヤーについての情報"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5222,22 +5364,22 @@
 msgstr[0] "これは、最大{0}このオブジェクトが変更されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "空の値でキーを削除。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<差異あり>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "値を変更しますか?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5245,69 +5387,73 @@
 msgstr[0] "{0}このオブジェクトのプロパティーの変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "キーを選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "値を選択してください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "プロパティを変えたいオブジェクトを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "選択されたオブジェクトのプロパティ"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "プロパティの編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "関連から削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "プロパティの削除"
@@ -5315,40 +5461,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "全てのリレーションのリストを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "リレーション: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "選択したリレーションの編集画面を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "選択したリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "新規リレーション作成"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr "現在の選択を選択したリレーションのリストへセットする"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "選択したリレーションを削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "ほかを選択："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "選択したリレーションをダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "メンバーのダウンロード"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5375,5 +5541,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5385,9 +5551,9 @@
 msgstr "選択: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "パネルの取り外し"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5396,5 +5562,5 @@
 "ます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "クリックすることでパネルの内容を最小化/最大化"
@@ -5478,5 +5644,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "リレーションメンバーをダウンロード"
@@ -5507,23 +5674,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "タグとメンバ－"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr "親リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr "子リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5535,14 +5702,14 @@
 "参照をどうしますか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr "削除し、リレーションをクリーンナップ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr "無視し、リレーションはそのまま"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5555,9 +5722,9 @@
 "か？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr "複数のメンバーが同じプリミティブを参照しています"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5569,5 +5736,5 @@
 "起こすので薦められません。<br>リレーション ''{0}'' をスキップします。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5575,5 +5742,5 @@
 "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5581,5 +5748,5 @@
 "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5589,5 +5756,5 @@
 "に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5597,20 +5764,20 @@
 "に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr "リレーション編集画面: 削除が選択されました"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5620,67 +5787,66 @@
 "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr "選択されたリレーションメンバーのプリミティブを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "リレーションメンバーをソート"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "リレーション編集画面: ソート"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "現在選択したメンバーを一つ上に移動します"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "リレーション編集画面: 上へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "選択したメンバーを一つ下に移動します"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "リレーション編集画面: 下へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr "このリレーションから現在選択されたメンバーを削除"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "リレーション編集画面: 削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr "現在編集されたリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "はい、競合を作成して閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "はい、競合を作成して閉じる"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr "クリックして競合を作成し、このリレーションエディタを閉じる"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "いいえ、編集を続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+msgstr "クリックしてリレーションエディタに戻り、リレーション編集を再開"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5691,9 +5857,9 @@
 "集を続けることはできません<br><br>競合を作成してエディタを閉じますか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "データ中に競合"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5704,41 +5870,41 @@
 "最初にこの競合を解決してからやり直してください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "現在の更新を適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "更新を適用してダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "更新をキャンセルしてダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "空のタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "メンバーのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr "リレーション編集画面: メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "選択されたメンバーにロールをセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "ロールを適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5750,17 +5916,17 @@
 "ルを削除することになります。<br>新しいロールを本当に適用しますか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "はい、適用します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "いいえ、適用しません"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr "空のロールを確認"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "現在選択中のリレーションメンバーが参照しているリレーションを編集"
@@ -5771,13 +5937,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr "最初に選択されたメンバーが参照しているプリミティブにズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "このリレーションのレイヤーは有効でないのでズームは無効化されました"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr "選択されたメンバーが無いのでズームは無効化されました"
@@ -5791,14 +5957,14 @@
 msgstr "リンク済み"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr "参照リレーションをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5848,60 +6014,89 @@
 msgstr "警告: タスクがキャンセルされたので例外を無視。例外: "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "接続していません"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr "ウェイは接続されています"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "リレーションメンバーをソート"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr "ウェイは前のリレーションメンバーに接続されています"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "リレーションメンバーをソート"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr "ウェイは次のリレーションメンバーに接続されています"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+msgstr "ウェイは前や後のリレーションメンバーに接続されていません"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "最初に目的の座標を入力してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#, fuzzy
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "現在開かれている変更セットはありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "行政区画の作成"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "現在選択されているリレーションを編集"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "場所の名称を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr "ロケーション名"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "最初にブックマークを選択してください、"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "現在選択したメンバーを一つ上に移動します"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "現在選択したメンバーを一つ上に移動します"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "最小経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "最大経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5911,368 +6106,138 @@
 "ることができます。）"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "境界囲み"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "データソースと型"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMapデータ"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "選択したノードでウェイを分割"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "生のGPSデータ"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "選択したウェイは選択したノードをつかって構成されていません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "新しいレイヤーとしてダウンロードする"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "エリアをダウンロードする"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "ダウンロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "リレーションが選択されていません"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "ダウンロードするエリアが広すぎます; サーバから拒否されるでしょう"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "ダウンロード領域はOKです。指定のサイズはサーバに受け入れられるでしょう"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "クリックしてダイアログを閉じ、オブジェクト削除を中断"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "現在選択されているリレーションを編集"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "編集する列を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "検索する地名を入れてください："
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "検索する地名を入れてください："
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "検索文字列を入力してください"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "地名検索結果をサーバから読み取ることができませんでした"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "検索する地名を入れてください："
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "地名"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "タイプ"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "近く"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "ズーム"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-"<b>ズーム:</b> マウスホイール、ダブルクリックまたは Ctrl + Up/Down <b>マップ"
-"を移動:</b> 右クリックしたままマウスを移動またはカーソルキーを使用。<b>選択:"
-"</b> 左クリックしたままフレームをドロー。"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "スリッピーマップ"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "ズームレベル"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "X軸"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "から"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "Y軸"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "タイル数"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-"Copy text   \t\r\n"
-"CSS ファイル''help-browser.css'' が読み込めません。例外コード: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr "JOSM ヘルプブラウザ"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>リモートサーバ ''{0}' への接続が開けません。<br>インターネット接続を"
-"チェックしてください。</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr "現在のヘルプページを外部ブラウザで開く"
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr "現在のヘルプページを編集"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr "現在のヘルプページを再ロード"
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr "前のページへ"
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr "次のページへ"
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr "JOSM ヘルプホームページへ"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
 #, fuzzy
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr "警告: ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Search ..."
+msgstr "検索..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
 #, fuzzy
-msgid "Failed to open help page"
-msgstr "現在のヘルプページを再ロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr "コマンド読込に失敗しました。ヘルプブラウザを終了中。例外コード:"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr "外部ヘルプブラウザの起動に失敗"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr "緯度 : "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr "経度 : "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr "座標"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "ノード {0} の履歴"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "ウェイ {0} の履歴"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "リレーション {0} の履歴"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "ダイアログを閉じる"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr "履歴をサーバからリロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr "参照の設定に失敗。参照ID {0} は履歴ID {1} と一致しません。"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, 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:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr "履歴がまだ初期化されていません。現在のプリミティブのセットに失敗。"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, 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:51
-msgid "Load history"
-msgstr "履歴をロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr "オブジェクト ID > 0 が期待されています。入力値: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr "ノード {0} の履歴をロード中"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr "ウェイ {0} の履歴をロード中"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, 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:79
-#, java-format
-msgid "Node {0}"
-msgstr "ノード {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "ウェイ {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "リレーション {0}"
+msgid "Click to start searching for places"
+msgstr "陸地の検索方向"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6629,4 +6594,6 @@
 #. 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" />
@@ -7007,6 +6974,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7072,11 +7040,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7086,6 +7054,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7095,79 +7063,353 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "名前"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "タイプ"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "近く"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+"<b>ズーム:</b> マウスホイール、ダブルクリックまたは Ctrl + Up/Down <b>マップ"
+"を移動:</b> 右クリックしたままマウスを移動またはカーソルキーを使用。<b>選択:"
+"</b> 左クリックしたままフレームをドロー。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "スリッピーマップ"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "ズームレベル"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "X軸"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "から"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "Y軸"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "タイル数"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+"Copy text   \t\r\n"
+"CSS ファイル''help-browser.css'' が読み込めません。例外コード: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr "JOSM ヘルプブラウザ"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr "URLを開けません"
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr "現在のヘルプページを外部ブラウザで開く"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr "現在のヘルプページを編集"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr "現在のヘルプページを再ロード"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr "前のページへ"
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr "次のページへ"
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr "JOSM ヘルプホームページへ"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr "コマンド読込に失敗しました。ヘルプブラウザを終了中。例外コード:"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr "外部ヘルプブラウザの起動に失敗"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr "緯度 : "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr "経度 : "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr "座標"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "ノード {0} の履歴"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "ウェイ {0} の履歴"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "リレーション {0} の履歴"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "ダイアログを閉じる"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr "履歴をサーバからリロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+"履歴はまだ初期化されていません。参照プリミティブのセットに失敗しました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr "参照の設定に失敗。参照ID {0} は履歴ID {1} と一致しません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, 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:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr "履歴がまだ初期化されていません。現在のプリミティブのセットに失敗。"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, 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:51
+msgid "Load history"
+msgstr "履歴をロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr "オブジェクト ID > 0 が期待されています。入力値: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr "ノード {0} の履歴をロード中"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr "ウェイ {0} の履歴をロード中"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, 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:79
+#, java-format
+msgid "Node {0}"
+msgstr "ノード {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "ウェイ {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "リレーション {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "ユーザ"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr "変更セット"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7249,4 +7491,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr "ファイルを選ぶためにファイル選択を起動してください"
@@ -7547,6 +7790,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0}個のオブジェクトを変更:"
@@ -7645,5 +7888,16 @@
 msgstr "変更セットID > 0 であるべきです。入力値: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, 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:105
 msgid "Preparing primitives to upload ..."
 msgstr "プリミティブアップロード準備中"
@@ -7677,110 +7931,110 @@
 msgstr "アップロードを続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "{0} のイメージ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "GPXの読み込み…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "地点 {0} x {1}に時刻がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "時刻 \"{0}\"を地点 {1}×{2} から読み取ることができませんでした"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "{0}を読み込んでいます ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "読み取り可能な時刻のついた画像が見つかりませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "{0}を読み込んでいます ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "ジオタグのついた画像"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS開始: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS終了: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "現在の差分: {0} 秒"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "タイムゾーンの違い: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
 msgstr[0] "画像"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "トラック内に {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "時計の同期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEGイメージ(*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "ファイル \"{0}\"中の日付が取得できません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "ファイル\"{0}\"にEXIFの時刻情報がありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "画像"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "写真の日付を入力(mm/dd/yyyy HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "GPSユニットのタイムゾーン(写真の時間との違い)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "時刻をGPSユニットと同期する"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "入力した時刻は、解釈できません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7788,30 +8042,30 @@
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "線描画のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "全体設定を使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引かない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "線描画オプションの選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7819,5 +8073,5 @@
 msgstr "配色のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7826,5 +8080,5 @@
 msgstr "既定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7833,43 +8087,43 @@
 msgstr "色選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "名前のついた地点からのマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} からの名前付きトラックポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "音声のインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "WAV音声ファイル(*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} からの音声マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "イメージのインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "名前: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "記述: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7878,28 +8132,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "説明"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr "時間間隔"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "長さ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "長さ: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7907,5 +8161,5 @@
 msgstr[0] "{0}ルート, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7913,10 +8167,10 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7927,11 +8181,11 @@
 "てください："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7941,29 +8195,29 @@
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7974,13 +8228,9 @@
 "すか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr "データのダウンロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7990,5 +8240,5 @@
 "に変更又は移動されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7998,23 +8248,23 @@
 "外します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "データレイヤー {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "ダウンロード領域の外"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "バージョン {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8022,12 +8272,13 @@
 msgstr[0] "検出された競合が {0} 個あります"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, fuzzy, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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} 個のオブジェクトはサーバから削除されましたので、ローカルなデータセットか"
@@ -8035,27 +8286,41 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr "競合リストダイアログを見て<br>手動で解決してください。"
-
+#, fuzzy, 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] "競合リストダイアログを見て<br>手動で解決してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "ダイアログを閉じてJOSMでの編集に戻る"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0}は削除されました)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0}は次からなります:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0}は削除されました)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "設定解除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "APIバージョン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8220,6 +8485,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8234,6 +8497,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8415,5 +8676,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8746,21 +9007,20 @@
 msgstr "言語"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "ビルトインのデフォルトを有効"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
-msgstr "使用スタイル"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -8774,6 +9034,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "アップデート"
@@ -8924,68 +9183,107 @@
 msgstr "ショートカット"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "有効化"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr "アイコンのパス"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "簡単な説明: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "作者: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "ウェブページ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "バージョン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr "アイコンのパス"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "デフォルトをコピー"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "コピーする列を選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr "リストに新しいXML ソースを追加。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "リストから選択した情報源を削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr "デフォルト(詳細はツールチップ参照)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "結合された要素のリストから選択したエントリを削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "すべてのオブジェクトの選択したキーの値の編集"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "結合された要素のリストから選択したエントリを削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "新しいタグを追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "選択済みの開かれた変更セットを閉じる"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "選択したソースの編集"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "ノード {0} の履歴をロード中"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>データのアップロード先またはダウンロード元Failed to upload data to or "
+"download data from<br>''{0}''<br>で、データ転送中に問題が発生したために処理が"
+"失敗しました。<br>詳細(原文): {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, fuzzy, 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:39
 msgid "Sort presets menu"
 msgstr "プリセットメニューの並び替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9187,5 +9485,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "この機能の詳細情報"
@@ -9249,16 +9547,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "プリセットグループ \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "プリセットグループ \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9266,5 +9564,5 @@
 msgstr "OSMサーバに接続中..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9375,5 +9673,5 @@
 msgstr "ファイル \"{0}\" の解析に失敗"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です"
@@ -9609,5 +9907,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9634,5 +9932,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9640,5 +9938,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9652,5 +9950,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9661,50 +9959,50 @@
 msgstr "変更セットのリストを解析中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "正しくないパスワードかユーザ名です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告:パスワードは暗号化されずに送信されます。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "ユーザーとパスワードを保存します(暗号化されません)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "パスワードを入力して下さい"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "ログイン"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSMサーバのベースURL（REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "OSM アカウントへのログイン名(e-mail)。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "サーバのベースURL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "OSM ユーザ名 (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSMパスワード"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9807,5 +10105,5 @@
 msgstr "ファイル \"{0}\" はありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9816,39 +10114,39 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "<way> 要素を直接引き継いでない XML 要素の <nd> が見つかった。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "ウェイ {1} の<nd>上に必要な属性 ''{0}'' がありません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "要素 <nd> の属性 ''ref'' に不正な値。入力値: {0}。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 "要素 <relation> の直接の子要素でないXML 要素 <member> が見つかりました。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9857,19 +10155,19 @@
 "リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "ref=0の不完全な<member>指定です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr "入力ストリーム中に未定義の要素 ''{0}'' があります。スキップします。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "id=0の禁じられたオブジェクトです"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9878,7 +10176,11 @@
 msgstr "ID {0} のOSM プリミティブの ''version'' 属性に不正な値。入力値: {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9890,25 +10192,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "ID {0} のOSM プリミティブ「の属性 ''version'' がありません"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "必要な属性 ''{0}'' がありません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9917,5 +10219,5 @@
 "外部ID ''{0}'' のウェイは外部ID ''{1}'' の存在しないノードを含んでいます。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9926,5 +10228,5 @@
 "ドが見つからないため、不完全です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9933,5 +10235,5 @@
 "外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9942,13 +10244,13 @@
 "しています。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr "OSMデータ解析中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr "データセット準備中..."
@@ -9959,14 +10261,13 @@
 msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "OSMからダウンロード..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr "参照ウェイをダウンロード中"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr "参照リレーションをダウンロード中"
@@ -10082,15 +10383,15 @@
 "ロードの使用が必須ですが、API は取扱えません。差分アップロードを無視します。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "プラグインのアップデート"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "ダウンロードプラグイン"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10103,29 +10404,33 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] ""
 "{0} 個のプラグインのダウロードに成功しました。JOSMを再起動してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "プラグイン {0} をダウンロードしています..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "ダウンロードをスキップ"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "プラグインをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "ダウンロードをスキップ"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10137,5 +10442,5 @@
 msgstr "プラグイン {0} でエラーが発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -10144,5 +10449,5 @@
 "ん。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10151,6 +10456,31 @@
 "<br>Delete from preferences?</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+"<html>プラグイン {0} が読み込まれました。<br>このプラグインは開発を終了してい"
+"て、問題を起こす可能性があります。<br>無効にしてください。<br>使用をやめます"
+"か？</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "プラグインが最後に更新されてから{0}日以上経過しました。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "プラグインのアップデート"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
@@ -10159,5 +10489,5 @@
 "す。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
@@ -10165,39 +10495,26 @@
 "プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "プラグインが見つかりません： {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "プラグインが最後に更新されてから{0}日以上経過しました。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager."
-"warntime'を編集することで変更できます）"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "プラグイン {0} を読み込めません。設定から削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "このプラグインを使用不可にする"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "プラグインを継続"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10207,9 +10524,9 @@
 "上書きできる権限があるかどうか、確認してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10217,10 +10534,10 @@
 msgstr "予期せぬ例外がプラグイン\"{0}\"で発生しました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "このプラグインから得られる情報では、作者は {0} です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10229,9 +10546,9 @@
 "い。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "このプラグインを使用不可にしますか?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10241,22 +10558,22 @@
 "再起動してください。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr "プラグインは削除できませんでした。おそらく既に無効化されています"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "プラグイン情報"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "説明がありません"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "もっと詳細"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10264,18 +10581,18 @@
 msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "プラグイン情報が見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "{0} という名前のプラグインは利用できません。更新はスキップされました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "インストールされた全てのプラグインは最新です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10288,9 +10605,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "不足するプラグインをダウンロードします。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10305,9 +10622,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10329,19 +10646,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "不明な"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "JOSMに付属のプラグイン"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10406,5 +10723,5 @@
 msgstr "(テキストはクリップボードにコピーされています。)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10415,5 +10732,5 @@
 "ンターネット接続をチェックしてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10424,5 +10741,5 @@
 "変更セットはタイムアウト後にサーバによって自動的に閉じられます。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10435,5 +10752,5 @@
 "ン {0} への参照を削除し、再度アップロードしてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10445,10 +10762,10 @@
 "タセットは前提条件に違反しています。<br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr "サーバから返されたデータ ''{0}'' が解析できません"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10459,5 +10776,5 @@
 "れています。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10468,18 +10785,18 @@
 "閉じられています。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
-#, java-format
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
+#, fuzzy, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
+"(untranslated):<br>{0}</html>"
 msgstr ""
 "<html>サーバから競合検出の報告がありました。<br>エラーメッセージ(未翻訳):<br>"
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>サーバから競合検出の連絡がありました。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10492,5 +10809,5 @@
 "ドしていないためだと思われます。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10501,5 +10818,5 @@
 "チェックしてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10511,5 +10828,5 @@
 "失敗しました。<br>詳細(原文): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10520,10 +10837,10 @@
 "おそらく一時的な問題です。後ほどやり直してみてください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "OSM サーバ ''{0}'' より不正リクエストの報告がありました。<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10535,10 +10852,10 @@
 "ポートファイルを使用してください。"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>エラーメッセージ(未訳): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10549,5 +10866,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10560,5 +10877,5 @@
 "てください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10573,5 +10890,5 @@
 "は失敗</strong>です。<br><br>エラーメッセージ:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10688,13 +11005,4 @@
 "キー ''{0}'' の設定が存在しません。設定から window geometry を復元できませ"
 "ん。"
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
-msgstr ""
-"キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの"
-"geometry にフォールバックします。詳細: {1}"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -10840,5 +11148,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -10854,10 +11163,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "奇数"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10865,103 +11174,103 @@
 msgstr "偶数"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr "アルファベット順"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr "リレーション: {0}"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr "ストリート利用と関連付ける:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr "ナンバリングスキーム:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr "開始番号:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr "終了番号:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr "{0} 付加番地に関連付ける"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr "市区:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr "都道府県:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr "郵便番号:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr "国"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr "フルアドレス:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr "オプション情報"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr "アドレス補間ウェイと関連付けるストリートを選択してください"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr "このストリートのアドレス補間ウェイを選択してください"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr "奇数番号のアドレスが期待されている"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr "偶数番号のアドレスが期待されている"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr "国コードは2文字でなければなりません"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr "開始および終了アドレスに正しい値を入力してください"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr "アルファベットのアドレスは文字で終了しなければなりません"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr "開始および終了番号はアルファベットアドレスが同じでなければなりません"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr "開始アドレス文字は終了アドレス文字よりも小さくなければなりません"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr "開始アドレスに正しい数字を入力してください"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr "終了アドレスに正しい数字を入力してください"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr "開始アドレスの数字は終了アドレスの数字よりも小さくなければなりません"
@@ -11015,46 +11324,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIFからGPS位置を取得"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "ディレクトリ走査の開始"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "選択したファイルはのひとつはヌルでした !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "写真を取り込む"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "標準的なディレクトリへのパスを入手できません {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "ディレクトリ {0} を走査"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "GPXに関連づける"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11321,5 +11631,5 @@
 msgstr "ファイル{0}にエラー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11334,10 +11644,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr "用紙選択"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11387,13 +11697,13 @@
 msgstr "選択..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "自動ソーシング"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11405,13 +11715,13 @@
 "F11 を取得アクションに戻しますか？"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr "F11 を取得ショートカットに戻す"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "変更が実施されるようにJOSM を停止しました"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11527,7 +11837,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "座標を次の単位で表示"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11545,5 +11854,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11587,13 +11896,13 @@
 msgstr "行政区画の作成"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr "cadastre WMS に接続中 ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr "画像は既にロードされています"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11735,22 +12044,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "ロケーションの変更"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "次のリクエスト用に、新規の位置をセットしてください。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "新規レイヤーを追加"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "ロケーション"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11760,5 +12069,5 @@
 "cadastre.gouv.fr に従ってください。(フランス語の場合)</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "新規レイヤーを作成"
@@ -11772,9 +12081,9 @@
 msgstr "新しい cookie を入手してください(セッションがタイムアウトしました)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr "PNG ファイル (*.png)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr "PNG 形式でエクスポート(ラスター画像のみ)"
@@ -11793,9 +12102,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "WMSレイヤーの位置を調整"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11819,5 +12127,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "ブランクのレイヤー"
@@ -11846,5 +12154,5 @@
 msgstr "都道府県 bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11855,9 +12163,9 @@
 "であるべきです"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "キャッシュフォーマットエラー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11865,9 +12173,9 @@
 "キャッシュのランベルトzone {0} は現在のランベルトzone {1} と互換がありません"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "ランベルトゾーンキャッシュエラー"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11964,5 +12272,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "データが読み込まれていません。"
@@ -12372,7 +12680,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "水域(湖沼)"
@@ -12579,32 +12887,32 @@
 msgstr "LiveGPSレイヤー"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "GPSトラックの取り込み"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "gpsdサーバに接続し、LiveGPSレイヤーに現在位置を表示します。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "一回中央寄せ"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "現在の位置をLiveGPSのレイヤーの中心にする。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "自動中心設定"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "現在の位置にLiveGPSレイヤーを引き続き中央寄せする。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12693,24 +13001,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr "マルチポリゴンを作成"
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr "マルチポリゴンを作成。"
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr "選択されたウェイのひとつは既に別のマルチポリゴンの一部です。"
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr "少なくとも2つのウェイを選択してください。"
@@ -12867,4 +13175,9 @@
 msgstr "Firefoxの実行ファイル"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "レイヤー"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12912,5 +13225,5 @@
 msgstr "許可されたアクション"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
@@ -12918,26 +13231,26 @@
 "求されました。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../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:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "本当にこれを許可してよろしいですか？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "リモート制御の指示を確認した"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr "リモート制御より新しいノードを作成するかどうか問合せがきました。"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12958,7 +13271,5 @@
 msgstr "リレーションが選択されていません"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12967,4 +13278,5 @@
 #: ../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 "ルーティング"
@@ -12986,25 +13298,25 @@
 msgstr "ルーティングノードのリストを開く"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "ルートの消去"
@@ -13034,93 +13346,87 @@
 msgstr "重みの値の入力"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "スリッピーマップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "自動ズーム: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "タイルの読み込み"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "タイルの状態を表示"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "要求の更新"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "情報を表示"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "全てのタイルをロード"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "ズームアップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "ズームダウン"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr "タイルのキャッシュをフラッシュ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "画像 "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "自動ズーム"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "スリッピーマップ"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "スリッピマップ プラグイン用設定"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "タイルソース"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "自動ズーム: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "タイルの自動読み込み "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "最大ズーム lvl: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "最大ズーム lvl: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Fade background: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "メタデータの読み込みエラー"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr "更新要求中にエラー: ズームレベル12 ではありません"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "要求: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "アップデート要求時にエラー"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -13133,5 +13439,5 @@
 msgstr "１分ごとに取得したデータをファイルに保存します。"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13293,5 +13599,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "ストリートの名前"
@@ -13338,29 +13644,29 @@
 msgstr "結合させるクローズドノードを最低ひとつ選んでください。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "交差点がみつかりません。何も変更されませんでした。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "すべての交差点にノードを追加"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "内側のマルチポリゴンの一部ではないウェイを削除"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "リレーションの修正"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "結合された自己重複エリア"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "結合されたオーバーラップエリア"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13370,33 +13676,33 @@
 "ことを確認してください。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "すべての競合に値を入力してください。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "競合を解決する"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "タグ競合を修正"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "リレーションから要素を削除"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "エリアの結合：　短いウェイの削除"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "閉じたウェイ"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "内部のウェイからタグを削除"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "エリア結合機能"
@@ -13605,8 +13911,4 @@
 msgstr "選択したエラーを修正"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "無視する"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13651,25 +13953,24 @@
 msgstr "\"{0}\" を \"{1}\" で置き換える。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "海岸線"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "このテストは海岸線が正しいことをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "順序付いていない海岸線"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "順序付いていない海岸線"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "順序付いていない海岸線"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13693,18 +13994,18 @@
 msgstr "交差するウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "ノードの複製"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "同位置のノード"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "確認"
@@ -13951,4 +14252,8 @@
 msgstr "選択したソースの編集"
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "リストから選択した情報源を削除"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14163,7 +14468,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "建物"
@@ -14177,5 +14482,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "領域"
@@ -14185,9 +14490,9 @@
 msgstr "閉じていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "つながっていないウェイ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -14195,17 +14500,17 @@
 "クしています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "ウェイは他の高速道路の近くでノードで終わっています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "ウェイは他のウェイの近くでノードで終わっています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "ほかのウェイに近いウェイのノード"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "他のウェイの近くに結合されたウェイ"
@@ -14299,22 +14604,26 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
-#, fuzzy
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr "Walking Papers: {0}"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "ウェイ終端の開始ノードを選択"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "ラインの終端に到達"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "ジャンクションに到達"
@@ -14577,9 +14886,9 @@
 msgstr "ファイルフォーマットエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "ファイルからデータをロードするためのブランクWMSレイヤーを開く"
@@ -15071,6 +15380,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "道路番号"
@@ -15632,5 +15941,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr "金属"
@@ -15642,5 +15951,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "森"
@@ -15928,7 +16237,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "はい"
@@ -16077,8 +16386,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "いいえ"
@@ -16205,31 +16514,4 @@
 msgstr "ジャンクションの編集"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "タイプ"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16350,5 +16632,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "居住区域内道路"
@@ -16383,5 +16665,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "敷地内道路"
@@ -16416,5 +16698,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "工事中"
@@ -16804,12 +17086,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "操作員"
@@ -17022,6 +17304,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "高度"
@@ -17451,5 +17733,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "沼地、湿地"
@@ -17982,25 +18264,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "営業時間"
@@ -18066,24 +18348,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr "24/7"
@@ -18096,24 +18378,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
@@ -18126,24 +18408,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "火-日 08:00-15:00; 土 08:00-12:00"
@@ -18176,6 +18458,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "参照番号"
@@ -18191,5 +18473,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "地下"
@@ -18203,5 +18485,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "料金"
@@ -18437,5 +18719,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "避難所"
@@ -18903,5 +19185,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "サイクリング"
@@ -18916,5 +19198,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "スキー"
@@ -19068,16 +19350,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "遺跡（群）"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "遺跡（群）の編集"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -19085,55 +19380,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "境界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "遊び場"
@@ -19141,35 +19436,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "つり"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -19183,6 +19478,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -19574,30 +19869,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "スポーツ"
@@ -19607,227 +19902,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "運動場"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "多目的"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Multiの編集"
+
+#. 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"
@@ -19864,203 +20212,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "登山"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "スケート"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "水泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -20068,56 +20416,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "中間"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "射撃"
@@ -20125,127 +20473,127 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "フットボール"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "野球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "ペロタ"
@@ -20253,55 +20601,55 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "テニス"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "建造物"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "建物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "建物"
@@ -20309,5 +20657,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "公共の建物"
@@ -20315,10 +20663,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "役場"
@@ -20326,10 +20674,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "大使館"
@@ -20337,10 +20685,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "裁判所"
@@ -20349,10 +20697,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "刑務所"
@@ -20361,10 +20709,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "警察"
@@ -20374,10 +20722,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "消防署"
@@ -20386,10 +20734,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "郵便局"
@@ -20397,5 +20745,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -20403,15 +20751,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "学校"
@@ -20419,10 +20767,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "大学"
@@ -20430,10 +20778,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "短大"
@@ -20441,5 +20789,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "短大の編集"
@@ -20447,5 +20795,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "映画館"
@@ -20454,10 +20802,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "図書館"
@@ -20466,9 +20814,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "美術館"
@@ -20476,10 +20824,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "劇場"
@@ -20488,10 +20836,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -20501,5 +20849,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -20508,6 +20856,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "宗教"
@@ -20516,66 +20864,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "宗派"
@@ -20584,81 +20932,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "住所"
@@ -20667,5 +21015,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -20673,5 +21021,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "番地"
@@ -20679,20 +21027,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "都市名"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "国コード"
@@ -20701,5 +21049,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -20707,61 +21055,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "アルファベット順"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "工場"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "タワー"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
@@ -20769,25 +21117,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "灯台"
@@ -20795,10 +21143,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "風車"
@@ -20806,10 +21154,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -20818,37 +21166,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "ガス"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "熱"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "どれかの実体"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -20858,10 +21206,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "クレーン"
@@ -20869,10 +21217,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "ビーコン"
@@ -20880,10 +21228,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -20891,10 +21239,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -20902,5 +21250,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
@@ -20908,5 +21256,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "発電機"
@@ -20916,35 +21264,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "変電所"
@@ -20953,10 +21301,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -20965,5 +21313,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -20971,10 +21319,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "ライン参照"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "送電塔"
@@ -20985,23 +21333,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "送電線"
@@ -21010,75 +21358,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr "線の種類"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr "線"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr "細い線"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "電圧"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr "シングル"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr "ダブル"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "トイレ"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "電話"
@@ -21087,5 +21435,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -21093,5 +21441,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "コイン"
@@ -21099,5 +21447,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "備考"
@@ -21105,5 +21453,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -21111,5 +21459,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -21117,15 +21465,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "リサイクル"
@@ -21134,5 +21482,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -21140,35 +21488,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "ベンチ"
@@ -21177,31 +21525,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr "茶"
@@ -21272,40 +21620,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "緑"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "草地"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -21314,30 +21661,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "噴水"
@@ -21346,10 +21693,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -21358,10 +21705,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -21369,33 +21716,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr "薬品屋"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -21403,9 +21750,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "キオスク"
@@ -21413,27 +21760,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr "本屋"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -21441,5 +21788,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -21447,88 +21794,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "糞袋"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "決済または会員用カード"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "精肉店"
@@ -21536,9 +21883,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "パン屋"
@@ -21546,9 +21893,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "生花店"
@@ -21556,18 +21903,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "酒屋"
@@ -21575,54 +21922,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "酒屋の編集"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "酒屋(飲み物屋)の編集"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "家電店"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "家具店"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -21630,9 +21977,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "金物屋"
@@ -21640,9 +21987,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -21650,54 +21997,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "文具店"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "靴店"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "ビデオ"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -21705,9 +22052,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "ランドリー"
@@ -21715,9 +22062,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -21725,28 +22072,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "メガネ屋"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "銀行"
@@ -21754,14 +22101,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "両替"
@@ -21769,5 +22116,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -21775,15 +22122,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "医院"
@@ -21791,18 +22138,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "薬局"
@@ -21810,5 +22157,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -21816,9 +22163,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "病院"
@@ -21826,10 +22173,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -21838,5 +22185,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -21845,20 +22192,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -21866,5 +22213,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "動物病院"
@@ -21873,59 +22220,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr "地理学"
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "地名"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "大陸"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "国(country)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "州(state)"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "地方"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "郡"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "郡の編集"
@@ -21933,15 +22285,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "市区"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "町"
@@ -21949,10 +22301,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -21960,25 +22312,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "村"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -21986,5 +22338,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "地域"
@@ -21992,10 +22344,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "島"
@@ -22003,10 +22355,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "島の編集"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr "小島"
@@ -22014,5 +22366,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr "小島を編集"
@@ -22020,5 +22372,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -22026,10 +22378,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "山頂"
@@ -22037,10 +22389,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "氷河"
@@ -22048,10 +22400,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "火山"
@@ -22059,70 +22411,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "国境"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "地点名"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "国立公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "樹木・林"
@@ -22131,15 +22483,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "森"
@@ -22148,5 +22500,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -22154,17 +22506,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "森"
@@ -22173,14 +22525,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -22188,25 +22540,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "低木林"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "山(Fell)"
@@ -22214,10 +22566,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "荒れ地"
@@ -22225,5 +22577,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -22231,5 +22583,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -22238,45 +22590,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "農地"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -22284,25 +22636,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "庭園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "里山"
@@ -22310,10 +22662,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "共有地"
@@ -22321,20 +22673,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -22342,5 +22694,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -22348,15 +22700,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "墓所"
@@ -22364,9 +22716,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -22374,39 +22726,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "商用"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "工業"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -22414,15 +22766,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "軍用"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -22430,55 +22782,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "採石場"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -22488,5 +22840,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -22495,10 +22847,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -22506,5 +22858,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -22513,5 +22865,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -22519,34 +22871,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -22555,15 +22907,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "ウェイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "ウェイへ"
@@ -22571,5 +22923,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "ルート"
@@ -22578,5 +22930,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -22584,5 +22936,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "ルート種類"
@@ -22654,5 +23006,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22661,17 +23013,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "スキー"
@@ -22724,5 +23076,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22731,13 +23083,13 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "迂回路"
@@ -22751,10 +23103,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -22762,31 +23114,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr "ルート状態"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -22795,30 +23147,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -23256,11 +23608,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "破棄された"
@@ -25284,5 +25636,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "信号_水域"
@@ -25954,4 +26306,12 @@
 #.
 #. <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"/>
@@ -25976,5 +26336,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "史跡"
@@ -25988,5 +26348,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "石切り場"
@@ -26000,5 +26360,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "埋め立て地"
@@ -26020,5 +26380,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -26032,5 +26392,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "森"
@@ -26044,5 +26404,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "農家の庭"
@@ -26065,5 +26425,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "小売りの商用地"
@@ -26077,5 +26437,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "工業地"
@@ -26089,5 +26449,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -26101,5 +26461,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "緑地"
@@ -26113,5 +26473,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "鉄道公園"
@@ -26168,7 +26528,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "軍用地"
@@ -26182,5 +26542,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "共同墓地"
@@ -26193,5 +26553,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "山頂"
@@ -26206,5 +26566,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "氷河"
@@ -26218,5 +26578,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "火山"
@@ -26271,8 +26631,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "自然"
@@ -26286,5 +26646,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "低木"
@@ -26298,5 +26658,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "荒地"
@@ -26310,8 +26670,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "領域"
+msgstr ""
 
 #. color water
@@ -26323,5 +26682,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "泥"
@@ -26335,5 +26694,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "砂浜"
@@ -26411,8 +26770,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "ルート"
@@ -26460,7 +26819,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "行政区境"
@@ -26610,11 +26969,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "場所"
@@ -26662,6 +27021,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "住所"
@@ -26969,35 +27328,107 @@
 msgstr "チェコ UHUL:ORTOFOTO"
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "ページ{0}を読み込む際にエラーが発生しました。"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgid "File could not be found."
+#~ msgstr "ファイルは存在しませんでした。"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "ダウンロードするタスクを少なくとも一つ選んでください。"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "OSM API へのアップロード失敗"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "競合中のリレーション"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
+#~ "<html>選択 \"{0}\" は、リレーション \"{1}\" のロール {2}で使用されていま"
+#~ "す。<br>リレーションから削除しますか?</html>"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
 #~ msgstr ""
-#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A> または <A HREF=\"{1}\">"
-#~ "あなたの言語</A>で作成してください。"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "JOSMオンラインヘルプからのみヘルプページを編集できます。"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "プリセット \"{0}\"を使います"
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "レイヤーを最初に開く(GPX, OSM, cache)"
+#~ "<html>選択 \"{0}\" はリレーション \"{1}\" で使用されています。<br>リレー"
+#~ "ションから削除しますか？</html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "解析中にエラー"
+
+#~ msgid "File not found"
+#~ msgstr "ファイルが見つかりません"
+
+#~ msgid "Replace"
+#~ msgstr "置換"
+
+#~ msgid "Replace the way this member refers to with the combined way"
+#~ msgstr ""
+#~ "このメンバーが参照しているウェイを結合するウェイと置き換えてください。"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "最初に目的の座標を入力してください。"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "最初にブックマークを選択してください、"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "検索文字列を入力してください"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "地名検索結果をサーバから読み取ることができませんでした"
+
+#~ msgid "name"
+#~ msgstr "名前"
+
+#~ msgid "zoom"
+#~ msgstr "ズーム"
+
+#~ msgid "Copy defaults"
+#~ msgstr "デフォルトをコピー"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "コピーする列を選択してください。"
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。"
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "リストに新しいXML ソースを追加。"
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "デフォルト(詳細はツールチップ参照)"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "（この警告が何日で表示されるかは<br>設定オプションの'pluginmanager."
+#~ "warntime'を編集することで変更できます）"
+
+#~ msgid ""
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
+#~ msgstr ""
+#~ "キー ''{0}'' からの window geometry の復元に失敗しました。デフォルトの"
+#~ "geometry にフォールバックします。詳細: {1}"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "タイルの状態を表示"
+
+#~ msgid "Request Update"
+#~ msgstr "要求の更新"
+
+#~ msgid "error loading metadata"
+#~ msgstr "メタデータの読み込みエラー"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "更新要求中にエラー: ズームレベル12 ではありません"
+
+#~ msgid "requested: {0}"
+#~ msgstr "要求: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "アップデート要求時にエラー"
 
 #~ msgid "Move"
@@ -27030,7 +27461,4 @@
 #~ msgid "Server does not support changesets"
 #~ msgstr "サーバは変更した設定をサポートしていません"
-
-#~ msgid "Aborting..."
-#~ msgstr "中止します..."
 
 #~ msgid "Unsaved Changes"
@@ -27283,4 +27711,7 @@
 #~ msgstr "現在の選択か、全てのデータ一式の検証"
 
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "レイヤーを最初に開く(GPX, OSM, cache)"
+
 #~ msgid "board"
 #~ msgstr "board"
@@ -27288,4 +27719,13 @@
 #~ msgid "History of Element"
 #~ msgstr "要素の履歴"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "ページ{0}を読み込む際にエラーが発生しました。"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "プリセット \"{0}\"を使います"
 
 #~ msgid "Remove Selected"
@@ -27564,7 +28004,4 @@
 #~ "{0} のレイヤーに保存されていない変更があります。変更を無視して続けますか?"
 
-#~ msgid "There is currently no changeset open."
-#~ msgstr "現在開かれている変更セットはありません。"
-
 #~ msgid "Close current changeset"
 #~ msgstr "現在の変更セットを閉じる"
@@ -27678,4 +28115,15 @@
 #~ "見つかりません。"
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A>で作成してください。"
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "ヘルプページがありません。<A HREF=\"{0}\">英語</A> または <A HREF=\"{1}\">"
+#~ "あなたの言語</A>で作成してください。"
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
@@ -27708,4 +28156,10 @@
 #~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
 
+#~ msgid "Preset group ''{0}'' of group ''{1}''"
+#~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''"
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr "ランベルトzone を手動設定 (例：２つのゾーン間の位置用)"
+
 #~ msgid "Processing {0}"
 #~ msgstr "{0} 実行中"
@@ -27737,2 +28191,5 @@
 #~ msgid "Download referrers from OSM..."
 #~ msgstr "OSMから参照をダウンロードします..."
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "JOSMオンラインヘルプからのみヘルプページを編集できます。"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 18273)
+++ applications/editors/josm/i18n/po/nb.po	(revision 18508)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
 "PO-Revision-Date: 2009-09-22 15:16+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Bygger opp hovedskjermbilde"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Overser feilutformet URL: «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Advarsel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Overser feilutformet fil-URL: «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Feil"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "Ukjent"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Om"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Om programmet"
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap kartredigering"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Versjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Siste endring på {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java versjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Hjemmeside"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Feilrapporter"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Les meg"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revisjon"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Bidrag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Lisens"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Om JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Filen finnes ikke."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -318,42 +301,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -361,5 +343,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -372,19 +354,19 @@
 msgstr "Velg minst én allerede opplastet node, linje eller relasjon."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Flett"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -393,50 +375,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Legg til node …"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Legg til en node ved å skrive inn lengde- og breddegrad."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Rediger: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Angi koordinatene for den nye noden."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Bruk desimalgrader."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negative verdier betegner den vestlige/sørlige hemisfæren."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -445,5 +427,5 @@
 msgstr "Breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -452,27 +434,27 @@
 msgstr "Lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Juster nodene til en sirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Flytt de valgte nodene i en sirkel."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -482,5 +464,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -496,30 +478,28 @@
 msgstr "Verktøy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Velg minst fire noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -529,84 +509,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Juster nodene til en linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Flytt valgte noder til en rett linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Velg minst 3 noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "last ned"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Gå til {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Skaler og flytt skjermbildet til {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Bilde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Inet utvalg å vise."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Ingen konflikter å vise."
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -614,37 +594,37 @@
 msgstr "Fil: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Sammenføy linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Sammenføy flere linjer til én"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Endre retninger?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Snu og sammenføy"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -654,5 +634,5 @@
 "retningen på noen av linjene?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -660,41 +640,41 @@
 msgstr "Kan ikke sammenføye linjer. (Kan ikke bli sammenhengende nodestreng)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Sammenføy {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Velg minst to linjer å sammenføye."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopier valgte objekter til utklippstavla."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Velg noe å kopiere."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Lag en sirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Lag en sirkel fra tre valgte noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Disse nodene er ikke i en sirkel. Avbryter."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -704,16 +684,14 @@
 "tre noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -725,5 +703,5 @@
 msgstr "Slett"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Slett valgte objekter."
@@ -731,6 +709,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -744,73 +722,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Jevn fordeling av noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Fordel valgte noder med lik avstand etter en linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Last ned fra OSM …"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Last ned kartdata fra OSM-tjeneren."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Last ned"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Velg minst én oppgave å laste ned"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -819,39 +774,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Det oppstod {0} konflikter under import."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Fordoble"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Fordoble utvalget ved å kopiere og umiddelbart lime inn."
@@ -861,41 +816,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Avslutt"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Avslutt programmet."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Eksporter til GPX …"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Eksporter dataene til GPX-fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Ingenting å eksportere. Hent inn data først."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -934,6 +889,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -952,9 +907,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -974,5 +929,5 @@
 msgstr "parameter «{0}» må ha en verdi"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -980,36 +935,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Eksporter GPX fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Vis historikk for OSMs noder, linjer eller relasjoner."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Informasjon om element"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Vis objektinformasjon om OSMs noder, linjer eller relasjoner."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Inkluder node i linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Inkluder node i nærmeste linjesegment"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Sammenføy node og linje"
@@ -1019,168 +974,186 @@
 msgstr "Ingen hurtigtast"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Flett lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Flett det gjeldende laget inn i et annet lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Samle noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Samle noder i den eldste"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Velg minst to noder til å samle"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Avbryter …"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Samle {0} noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Flett utvalgte"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Speilvend"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Speilvend valgte noder og linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Velg minst én node eller linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "opp"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Flytt objektene {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "ned"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "venstre"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "høyre"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Flytt {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Flytter Objekter {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Kan ikke flytte objekter utenfor kartet."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Ny"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Lag et nytt kart."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Åpne …"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Åpne en fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Åpne sted …"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Åpne en URL."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Separat lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Oppgi URL for nedlasting:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Last ned sted"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Last ned URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Laster ned data"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Vinkle Form"
@@ -1190,18 +1163,18 @@
 msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1210,9 +1183,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1221,36 +1194,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Vinkle (90)"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Lim inn"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Lim inn fra utklippstavla."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Lim inn egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Bruk egenskaper i utklippstavla på alle valgte element."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1259,5 +1233,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1266,59 +1240,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Innstillinger …"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Åpne side med globale innstillinger."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Gjør om"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Gjør om siste angrede handling."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Endre navn på lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Gi nytt navn på fil også"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Snu retning på linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Snu retning på alle valgte linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Velg minst én linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Snu retning på linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1326,10 +1300,10 @@
 msgstr "Lagre"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Lagre gjeldende data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1380,21 +1354,21 @@
 msgstr "Lagre lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Lagre som …"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Lagre aktive data i ny fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Velg alt"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1403,28 +1377,28 @@
 "Velg alle data i lag som ikke er slettet. OBS uferdige data blir også valgt."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Vis statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr "Vis statusrapport med informasjon for feilsøking"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Hjelp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Kopier til utklippstavlen og lukk"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1433,18 +1407,18 @@
 msgstr "Lukk"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Splitt linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Splitt en linje i den valgte noden."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Kan ikke splitte med dette utvalget"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1452,5 +1426,5 @@
 msgstr[1] "Valgte noder er ikke del av en linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1462,9 +1436,9 @@
 msgstr[1] "Mer enn én linje bruker de valgte nodene. Velg flere linjer."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Valgte noder er ikke på samme linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1472,10 +1446,10 @@
 msgstr[1] "Valgt linje inneholder ikke de valgte nodene."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Velg to eller fler noder for å splitte sirkelformet linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1502,60 +1476,60 @@
 msgstr "Splitt linje {0} i {1} deler"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Slå av/på GPX-linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Trekk linjer mellom GPS-punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Slår av/på global innstilling «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Fjern knytning til linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Dupliser noder som er med i flere linjer."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Denne noden har ikke knytninger"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Ingen av disse nodene har knytninger."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ingen noder i denne linjen har andre knytninger."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Valgte element har ikke knytninger som kan løses."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Velg:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* En node med egenskaper, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "– En node som brukes av flere linjer, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "– En node som er brukt av flere linjer, og en av linjene, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1563,10 +1537,10 @@
 "– En linje som har en eller flere noder, som er brukt av flere linjer, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "– En linje, og en eller flere av nodene som er brukt i flere linjer."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1579,9 +1553,9 @@
 "kopier og alle noder bli valgt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Node uten tilknytning"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1589,80 +1563,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Kopier {0} noder til {1} noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Angre"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Angre siste handling."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Tøm utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Fjern alle objekter fra utvalg."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Tøm utvalg (Fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Tøm utvalg (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Tegn omrisset av data hentet fra tjeneren."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Oppdater utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Det er ingen valgte objekter å oppdatere"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Utvalget er tomt"
@@ -1674,8 +1649,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1684,5 +1659,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1690,29 +1665,29 @@
 msgstr "Ingen endringer å laste opp."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Ingen endringer å laste opp. Finn frem data først."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Synkroniser hele datasettet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1733,11 +1708,11 @@
 "strong> for å gå tilbake og fortsette å redigere.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1752,5 +1727,5 @@
 "strong> for å avbryte operasjonen og fortsette å redigere.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1760,23 +1735,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Konfliktløsning"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1787,28 +1761,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Opplasting <strong>feilet</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Klarte ikke laste opp til OSM-API"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Oppdaterer objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1817,17 +1782,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Endre {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1846,11 +1825,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Zoom inn"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Zoom ut"
@@ -1930,21 +1909,17 @@
 msgstr "Spill av sakte"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Laster ned GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Laster ned GPX-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "GPS-rådata"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Laster ned data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1952,27 +1927,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Last ned {0} av {1} ({2} gjenstår)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Feil under nedlasting"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "synlig (på tjeneren)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Klikk for å fjerne plassering"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1989,7 +1976,22 @@
 "<strong>{2}</strong> for å ignorere.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Slettede eller flyttede objekter"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Følgende feil oppsto under nedlasting:"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Feil under nedlasting"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Feil under nedlasting"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2011,5 +2013,5 @@
 msgstr "Modus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2039,38 +2041,38 @@
 msgstr "valgt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 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:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Lag ny node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Veg node under pekeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2079,14 +2081,14 @@
 msgstr[1] "Sett inn ny node i {0} linjer."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "Start ny linje fra siste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Fortsett samme linje fra siste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Avslutt tegning."
@@ -2106,5 +2108,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slipp museknappen for å velge objektene i rektangelet."
@@ -2115,5 +2117,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Slipp museknappen for å avslutte rotasjon."
@@ -2175,5 +2177,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2182,5 +2184,5 @@
 "nærmeste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2193,4 +2195,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Forstørr"
@@ -2210,5 +2213,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Søk …"
@@ -2309,20 +2311,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>… – objekt med angitt antall noder"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> – alle endrede objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> – alle objekter i utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> – alle uferdige objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> – alle objekter uten egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2330,5 +2339,5 @@
 "<b>child <i>uttrykk</i></b> – alle underobjekter av objektene i uttrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2336,9 +2345,9 @@
 "<b>parent <i>uttrykk</i></b> – alle overobjekter av objektene i uttrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Bruk <b>|</b> eller <b>OR</b> for søk med logisk <i>eller</i>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2346,9 +2355,9 @@
 "«:»)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Bruk <b>(</b> og <b>)</b> for å gruppere uttrykk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2358,51 +2367,51 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Søk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Start søk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Fant ingen treff for «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Ingenting lagt til utvalg ved søk etter «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Fant {0} treff"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2434,26 +2443,40 @@
 msgstr "Ukjent objekttype: {0}. Tillatte verdier er node, way og relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Uventet symbol: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "OR mangler argument."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "NOT mangler argument."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Forventer parentes slutt."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Feil antall parametere for nodes-operator."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Ugyldig verdi for nodes-operator: {0}. Verdien må være antall noder eller "
+"intervall, for eksempel nodes:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Feil antall parametere for nodes-operator."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2464,5 +2487,5 @@
 "intervall, for eksempel nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2562,4 +2585,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2577,8 +2616,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Endre {0} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2659,5 +2698,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2693,4 +2732,15 @@
 msgstr "kan ikke løse uavgjort konflikt"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parameter «{0}» må ha en verdi"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2721,29 +2771,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Relasjonen har konflikter"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Slett fra relasjon"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Splitt linje i segment"
@@ -2751,6 +2778,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2762,5 +2789,5 @@
 "nå) .<br>Er du sikker på at du vil slette nodene?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2950,15 +2977,30 @@
 msgstr "Korriger egenskap automatisk"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Standardverdien er «{0}»."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Innstillingsfil har feil i linje {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2967,5 +3009,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2974,5 +3016,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2981,5 +3023,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2988,5 +3030,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2994,5 +3036,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3001,5 +3043,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3008,5 +3050,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3015,5 +3057,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3022,19 +3064,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Innstillinger lagret i {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kunne ikke laste opp innstillinger. Årsak: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Klarte ikke lese innstillinger fra tjener."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3043,5 +3108,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "Ukjent"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3063,20 +3148,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "V"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "Ø"
@@ -3087,4 +3172,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3152,14 +3251,14 @@
 msgstr "Advarsel: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3167,5 +3266,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3192,6 +3291,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3251,113 +3350,113 @@
 msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Linje for areal er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "multipolygon-linje «{0}» er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Slettet medlem «{0}» i relasjon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Linje «{0}» med færre enn to punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Fant mer enn én linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Fant mer enn én linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Fant mer enn én \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukjent rolle «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukjent medlemstype for «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Fant ingen linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Fant ingen linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Fant ingen node eller linje med «via»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Linje med «from» har ikke start eller slutt i en «via»-node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Linje med «from» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "linje med «to» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Fant ikke stil for restriksjon {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Skjæring mellom linjene «{0}» og «{1}»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Indre linje «{0}» er utenfor."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Multipolygon-medlem «{0}» er ikke en linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ingen ytre linje for multipolygon «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Skjæring mellom linjene «{0}» og «{1}»."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Indre linje «{0}» er utenfor."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil for indre linje «{0}» er samme som multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3373,11 +3472,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "tekst"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3396,5 +3494,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3405,5 +3502,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3432,5 +3528,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "bakgrunn"
@@ -3464,12 +3560,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambert-sone (Frankrike)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambert-sone (Frankrike)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3505,10 +3599,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3537,5 +3631,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "jernbane"
@@ -3552,4 +3646,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3565,33 +3661,33 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Forhåndsbetingelse brutt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3599,16 +3695,16 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Ukjent vert"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3621,4 +3717,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Laster ned \"Dagens melding\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Lukk vinduet"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3688,74 +3789,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Brukernavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Passord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "bruk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Vis hjelp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix-geometri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Last ned områdeavgrensing"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Åpne fil (som rå gps, dersom .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Last ned områdeavgrensing som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Velg med gitt søkestreng"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Start maksimert"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Gå tilbake til standardinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Velg språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3764,9 +3865,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3776,25 +3877,25 @@
 "du prøver --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "I stedet for  --download=<bbox> kan du bruke osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Gjør opplastede programtillegg tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Laster første programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Setter standardverdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Laster inn programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3807,11 +3908,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3836,6 +3937,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3936,25 +4037,22 @@
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "Laget er ikke i lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Feil ved tolking"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Fant ikke fila"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Nei, avbryt operasjonen"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3976,5 +4074,5 @@
 msgstr "unset: ikke sett egenskap på valgte objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4003,24 +4101,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Endre {0} objekt"
-msgstr[1] "Endre {0} objekt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Slett valgte objekter."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "ikke slettet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relasjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4032,5 +4127,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4079,5 +4174,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4094,5 +4189,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4314,8 +4409,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4636,6 +4731,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4649,6 +4744,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4706,36 +4801,36 @@
 msgstr "Tjenerens datasett inneholder ingen egenskap med nøkkel {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4747,5 +4842,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "alle"
@@ -4835,4 +4930,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4843,4 +4940,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4854,49 +4952,84 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Sorter valgte relasjonsmedlemmer eller hele listen."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Last ned medlemer av relasjon"
+
+#: ../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 ""
+
+#: ../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:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Opplasting <strong>feilet</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4933,6 +5066,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5019,10 +5152,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5089,5 +5219,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5132,4 +5263,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5155,6 +5287,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5163,22 +5295,22 @@
 msgstr[1] "Dette vil endre opptil {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Nøkkelen blir ikke lagret når den er tom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<different>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Endre verdier?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5187,69 +5319,73 @@
 msgstr[1] "Endre egenskap på inntil {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Velg en nøkkel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Velg en verdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Velg de objekter, du vil rette egenskaper for."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Egenskaper/medlemsskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Egenskaper for valgte objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Endre Oppsett"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Medlemskap"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Skift relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Slett fra relasjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vil du slette utvalget fra relasjon {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøkkel i alle objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
@@ -5257,40 +5393,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Åpne en liste over alle relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relasjoner: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Åpne en editor for den valgte relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Slet valgt relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Oprett ny relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Slet valgt relasjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Velg:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Slet valgt relasjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Last ned medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5317,5 +5473,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5327,14 +5483,14 @@
 msgstr "Utvalg: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Frigjør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klikk for at minimere/maksimere panelet"
@@ -5416,5 +5572,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Last ned medlemer av relasjon"
@@ -5444,23 +5601,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5469,14 +5626,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5486,9 +5643,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5498,15 +5655,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5514,5 +5671,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5520,20 +5677,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5542,67 +5699,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Flytt valgte medlem opp"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Flytt valgt medlem ned"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Ta i bruk løste konflikter og lukk vinduet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5611,9 +5767,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5622,41 +5778,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Last ned alle ufullstendige linjer og noder i relasjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Last ned medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5666,17 +5822,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5687,13 +5843,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5707,14 +5863,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5764,58 +5920,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Ikke Tilkoblet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Tast inn først de ønskede koordinater."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Lag avgrensing"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Flytt valgt medlem ned"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Tast inn et navn for stedet."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Velg først et bokmerke"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Flytt valgte medlem opp"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Flytt valgte medlem opp"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "maks. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "maks. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5825,361 +6011,137 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Yttergrense for arbeidsområde"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Datakilder og typer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap-data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Splitt en linje i den valgte noden."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "GPS-rådata"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Valgt linje inneholder ikke valgt node."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Last ned som nytt lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Last ned område"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Last ned"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Ingen relasjoner er valgt"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Området er for stort; vil sandsynligvis bli avvist av tjener"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
 "Områdets størrelse OK, størrelsen vil sannsynligvis aksepteres av tjener"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Flytt valgte medlem opp"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Velg raden som skal endres"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Gi et stednavn å søke etter:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Gi et stednavn å søke etter:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer-feil, muligens manglende egenskaper."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Skriv inn en søkestreng"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Klarte ikke lese søkeresultat om sted fra tjener"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Gi et stednavn å søke etter:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Steder"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "navn"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "type"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "nær"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Flytbart kart"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "Zoom-nivå"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x fra"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "Til"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y fra"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Flis-nummer"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Lukk vinduet"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-"Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i "
-"historikken."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-"Klarte ikke sette gjeldende versjon. Gjeldende versjon {0} er ikke "
-"tilgjengelig i historikken."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Last historikk"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Node {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Søk …"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Retning for søk etter land"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6537,4 +6499,6 @@
 #. 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" />
@@ -6915,6 +6879,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6980,11 +6945,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6994,6 +6959,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7003,79 +6968,350 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Navn"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Type"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "nær"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Flytbart kart"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "Zoom-nivå"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x fra"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "Til"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y fra"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Flis-nummer"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Lukk vinduet"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette referanseelement."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+"Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i "
+"historikken."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr "Historikk er ikke klargjort ennå. Klarte ikke sette gjeldende element."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+"Klarte ikke sette gjeldende versjon. Gjeldende versjon {0} er ikke "
+"tilgjengelig i historikken."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Last historikk"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Node {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Bruker"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7156,4 +7392,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7445,9 +7682,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Objekter som endres:"
+msgstr[1] "Objekter som endres:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7543,5 +7780,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7571,59 +7817,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Bilder for {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Les GPX …"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Ingen tid gitt for punkt {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Klarte ikke lese tid «{0}» for punkt {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Leser {0} …"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Ingen bilder med lesbare tidsstempler funnet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Leser {0} …"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Geotaggede bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS start: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS-slutt: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "nåværende forskjell: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "tidssone-forskjell: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7631,51 +7877,51 @@
 msgstr[1] "bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} innenfor sporet."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Synkronisér klokke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-bilder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Klarte ikke tolke datoen i fila «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Det er ikke noe EXIF-tidspunkt i fila «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Bilde"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Gi den viste dato (mm/dd/åååå TT:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "GPS-enhetens tidssone (forskjell fra foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synkronisér tidspunkt med GPS-enhet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Den indtastede tid kunne ikke tolkes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7683,30 +7929,30 @@
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Tilpass linjetegning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Bruk globale indstillinger."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter i dette laget."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Tegn ikke linjer mellem punkt i dette laget."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Velg linjetegnings-innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7714,5 +7960,5 @@
 msgstr "Tilpass farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7721,5 +7967,5 @@
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7728,43 +7974,43 @@
 msgstr "Velg en farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Markører fra navngitte punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Navngivne sporpunkt fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importer lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importer bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Navn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7774,28 +8020,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Lengde: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7804,5 +8050,5 @@
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7811,10 +8057,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Konverter til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7824,11 +8070,11 @@
 "skadeligt <br>Se her for å laste inn GPS spor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7838,29 +8084,29 @@
 msgstr "Konvertert fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Last ned fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Last ned alt innenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Max areal per forespørsel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7871,13 +8117,9 @@
 "Ønsker du<br>å fortsette?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Ingen GPX-spor er tilgængelige i laget som kan assosieres med lyd."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7887,5 +8129,5 @@
 "ble utelatt eller flyttet til start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7895,23 +8137,23 @@
 "utelatt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "utenfor nedlastet område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "versjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7920,39 +8162,55 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} slettet.)"
+msgstr[1] " ({0} slettet.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} slettet.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "ikke satt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "API versjon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8121,6 +8379,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8135,6 +8391,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8316,5 +8570,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8649,21 +8903,20 @@
 msgstr "Språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Benytt innebygd standardverdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+msgid "Used style"
+msgstr "Brukt stil"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
 msgid "Map Paint Styles"
 msgstr "Map Pain stiler"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
-msgid "Used style"
-msgstr "Brukt stil"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -8677,6 +8930,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Oppdater"
@@ -8829,68 +9081,105 @@
 msgstr "Hurtigtast"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Brukt stil"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Kort beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "Opphavsperson: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Nettside: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Versjon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Velg raden du vil kopiere."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr "Legg til ny XML kilde i liste."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Slett den valgte kilden fra lista."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Rett verdien for den valgte nøkkel for alle objekter"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "Fjern de valgte elementene fra lista over sammenslåtte elementer"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Legg til nytt lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Oppfrisk utvalgslisten"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Rediger valgt kilde."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Klarte ikke laste historikk fra tjeneren. Detaljer:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, fuzzy, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Meny for sortering av innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9090,5 +9379,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Mer informasjon om denne funksjonen"
@@ -9153,16 +9442,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Objektmalgruppe «{0}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Objektmalgruppe «{0}»"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9170,5 +9459,5 @@
 msgstr "Kontakter OSM-tjeneren …"
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9279,5 +9568,5 @@
 msgstr "Klarte ikke lese fil «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Lesefeil: Strukturen i GPX fila er ukjent"
@@ -9507,5 +9796,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9532,5 +9821,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9538,5 +9827,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9549,5 +9838,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9558,33 +9847,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Feil passord eller brukernavn."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advarsel: Passordet overføres ukryptert."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Lagre bruker og passord (ukryptert)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Logg inn"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "URL-adressen for OSM-tjeneren (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "E-postadresse for OSM-kontoen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9593,17 +9882,17 @@
 "noen passord."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "URL-adresse til tjener"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "OSM-brukernavn (e-post)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM passord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9709,5 +9998,5 @@
 msgstr "Fila «{0}» finnes ikke"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9716,38 +10005,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9755,19 +10044,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ufullstendig <member>-spesifikasjon med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Ulovlig objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9776,7 +10065,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9786,25 +10079,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9812,5 +10105,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9819,5 +10112,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9825,5 +10118,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9832,13 +10125,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Klargjør OSM-data …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9849,14 +10142,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Last ned fra OSM …"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9968,15 +10260,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Opdater programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Last ned Programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9989,29 +10281,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "{0} programtillegg lastet ned. Start JOSM på nytt."
 msgstr[1] "{0} programtillegg lastet ned. Start JOSM på nytt."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Laster ned programtillegg {0} …"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Hopp over nedlasting"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Last ned programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Hopp over nedlasting"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10023,10 +10319,10 @@
 msgstr "Det oppsto feil i programtillegget {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10036,10 +10332,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Siste oppdaterte programtillegg for {0} dager siden."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Opdater programtillegg"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
@@ -10047,39 +10365,26 @@
 "Programtillegget {1} er avhengig av programtillegg  {0} men ble ikke funnet."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Fant ikke programtillegget: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Siste oppdaterte programtillegg for {0} dager siden."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien i "
-"oppstettet 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Kan ikke laste inn programtillegg {0}. slettes fra innstillinger?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Fjern programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Behold programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10089,9 +10394,9 @@
 "skrive over eksisterende."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10099,10 +10404,10 @@
 msgstr "Det oppstod en uventet feil som kan stamme fra programtillegget «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "I følge nformasjon i tilleggsprogram, er {0} opphavsmann."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10110,9 +10415,9 @@
 "Prøv å oppdatere til ny versjon av programtillegg før du sender feilmelding."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Skal programtillegget fjernes?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10122,22 +10427,22 @@
 "lese programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "ingen beskrivelse tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Flere detaljer"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10146,18 +10451,18 @@
 msgstr[1] "Lastet ned informasjon om programtillegg fra {0} tjenere"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Fant ikke info om programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Alle installerte programtillegg er siste versjon."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10170,9 +10475,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Last ned programtillegg som mangler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10187,9 +10492,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10211,19 +10516,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versjon {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Programtillegg inkludert i JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10290,5 +10595,5 @@
 msgstr "(Teksten har alt blitt kopiert til utklippstavlen din.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10297,5 +10602,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10304,5 +10609,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10312,5 +10617,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10322,10 +10627,10 @@
 "datasett<br>bryter en forhåndsbetingelse.<br>Feilmelding:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10334,5 +10639,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10341,16 +10646,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10360,5 +10665,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10367,5 +10672,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10374,5 +10679,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10381,10 +10686,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10393,10 +10698,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10407,5 +10712,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10415,5 +10720,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10424,5 +10729,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10524,11 +10829,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10673,5 +10971,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpoler adresser"
@@ -10687,10 +10986,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Oddetall"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10698,103 +10997,103 @@
 msgstr "Heltall"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10848,46 +11147,47 @@
 "{0} km/t"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Leser GPS posisjoner fra EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Starter scanning av mapper"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "En av de valgte filene var null (tom)!!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Les bilder"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Klarte ikke å lage fullstendig sti til mappa  {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanner mappa {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Fant tom fil i mappa {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Feil ved lesing av fil i mappa {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Juster til GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11150,5 +11450,5 @@
 msgstr "Feil i fil {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11161,10 +11461,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11212,13 +11512,13 @@
 msgstr "Velg fra …"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Matrikkel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Auto sourcing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11231,13 +11531,13 @@
 "Vil du gjenopprette bruken av F11 til å laste ned bilder?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr "Gjenopprett F11-hurtigtast"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM avsluttes for at endringen skal tre i kraft."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11355,7 +11655,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Vis koordinater som"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11374,5 +11673,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11415,13 +11714,13 @@
 msgstr "Lag avgrensing"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11552,22 +11851,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Bytt område"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Bruk et nytt områder for neste nedlasting"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Legg til nytt lag"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Område"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11577,5 +11876,5 @@
 "www.cadastre.gouv.fr .</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Legg til nytt lag"
@@ -11589,9 +11888,9 @@
 msgstr "Be om ny cookie (Internett sesjon nedkobling)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11614,5 +11913,5 @@
 msgstr "Juster posisjonen på WMS-laget (kun rasterbilder)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11636,5 +11935,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Blankt lag"
@@ -11663,5 +11962,5 @@
 msgstr "Kommune avgrensing: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11672,9 +11971,9 @@
 "Create a new one."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Feil i mellomlager format"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -11682,9 +11981,9 @@
 "Lambert-sone {0} i hurtiglager ikke kompatibel med gjeldende Lambert-sone {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Feil Lambert sone på mellomlager"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11779,5 +12078,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Ingen data lastet inn."
@@ -12186,7 +12485,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "vann"
@@ -12397,32 +12696,32 @@
 msgstr "LiveGPS-lag"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Lagre GPS spor"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Koble til gpsd-tjener og vis nåværende posisjon i LiveGPS-lag"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Sentrer GPS nå"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Sentrer LiveGPS-laget til nåværende position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Auto-sentrer"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Sentrer LiveGPS-laget løpende til den nåværende posisjon."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12511,24 +12810,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12682,4 +12981,9 @@
 msgstr "Firefox-programfil"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Lag"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12728,30 +13032,30 @@
 msgstr "Tillatte handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Remote Control er bedt om å laste data fra API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Be om detaljer: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Vil du tillate dette?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Bekreft Remote Control handlinger"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Remote Control har bedt om data fra denne URL:"
@@ -12770,7 +13074,5 @@
 msgstr "Ingen relasjoner er valgt"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12779,4 +13081,5 @@
 #: ../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 "Ruteplanlegging"
@@ -12798,25 +13101,25 @@
 msgstr "Åpne liste over Noder i planlagt Rute"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
 msgstr "Legg til lag for ruteplanlegger"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Betingelser"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "Korteste"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "Raskeste"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Reverser Rute"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Slett rute"
@@ -12846,93 +13149,87 @@
 msgstr "Gi verdier for vekting"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Autozoom: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Last Kartbilde"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
 msgstr "Status på kartbilde"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Be op Oppdatering"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Hent alle kartbilder"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Zoom inn"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Zoom ut"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr "Tøm bildehurtiglager"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "bilde "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "Automatisk zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "Last kartbilder automatisk"
 
 #. 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Innstillinger for SlippyMap programtillegg."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Kilder for kartbilder"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Autozoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Automatisk leste kartbilder: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Max zoom niv: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Max zoom niv: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Demp bakgrunn: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "feil ved lesing av informasjon om data"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "bestilt: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "feil ved bestilling av oppdatering"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -12945,5 +13242,5 @@
 msgstr "Lagre til fil hvert minutt."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13109,5 +13406,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Gatenavn"
@@ -13154,29 +13451,29 @@
 msgstr "Velg minst én lukket linje å sammenføye med."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "Fant ingen skjæring. Ingen endringer ble gjort."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Noder er lagt til i alle skjæringspunkt"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Slette indre linjer som ikke er del av multipolygon (relasjoner)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Reparer relasjoner"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Slo sammen områder som overlappet seg selv"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Slo sammen overlappende områder"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13186,33 +13483,33 @@
 "oppstått."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Legg inn verdier for alle konflikter."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Løs konflikter"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Reparer konflikter i egenskaper."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Fjernede Element fra Relasjoner"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Slå sammen arealer: fjern korte linjer"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Lukket linje"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Fjern egenskaper fra indre linjer"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Funksjon Slå sammen Areal"
@@ -13421,8 +13718,4 @@
 msgstr "Korriger valgte feilmeldinger."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignorer"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13467,25 +13760,24 @@
 msgstr "Erstatt «{0}» med «{1}» for"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Kystlinjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Denne testen sjekker om kystlinjene er korrekte."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Kystlinje i uorden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Kystlinje i uorden"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Kystlinje i uorden"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13507,18 +13799,18 @@
 msgstr "Kryssende veier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Dobbelt-Noder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13765,4 +14057,8 @@
 msgstr "Rediger valgt kilde."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Slett den valgte kilden fra lista."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13977,7 +14273,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "bygning"
@@ -13991,5 +14287,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "område"
@@ -13999,25 +14295,25 @@
 msgstr "Ikke lukket linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Ikke knyttede linjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Sjekker om en linje har endepunkt nesten inntil annen  linje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Sluttnode nær annen ferdselsvei"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Sluttnode nær annen linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Linjenode nær annen linje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Knyttet endenode nær annen linje"
@@ -14109,21 +14405,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS lag ({0})  laster ned i zoom {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "Velg en startnode i enden av en linje"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "Nådde slutten av linja"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "Nådde et kryss"
@@ -14381,9 +14682,9 @@
 msgstr "Feil Fil Format"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Åpne tomt WMS lag til data fra fil"
@@ -14866,6 +15167,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Veinummer"
@@ -15427,5 +15728,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15437,5 +15738,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "skogsområde"
@@ -15723,7 +16024,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "ja"
@@ -15872,8 +16173,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "nei"
@@ -16000,31 +16301,4 @@
 msgstr "Rediger kryss"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Type"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16145,5 +16419,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "boligvei"
@@ -16178,5 +16452,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "adkomstvei"
@@ -16211,5 +16485,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "veiarbeid"
@@ -16599,12 +16873,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operatør"
@@ -16817,6 +17091,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Høyde"
@@ -17243,5 +17517,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "Myrområde"
@@ -17774,25 +18048,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Åpningstider"
@@ -17858,24 +18132,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17888,24 +18162,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17918,24 +18192,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17968,6 +18242,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Referansenummer"
@@ -17983,5 +18257,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "P-kjeller"
@@ -17995,5 +18269,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Gebyr"
@@ -18229,5 +18503,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Leskur / Ly for natten"
@@ -18695,5 +18969,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Sykling"
@@ -18708,5 +18982,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Ski"
@@ -18860,16 +19134,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Arkeologisk plass"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Rediger arkeologisk plass"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Rediger monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -18877,55 +19164,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Fritid"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Lekeplass"
@@ -18933,35 +19220,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Rediger lekeplass"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -18975,6 +19262,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "velg sport:"
@@ -19366,30 +19653,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "sport"
@@ -19399,227 +19686,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "flerbruk"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "bueskyting"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "turn"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australsk fotball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "cricketnett"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "sykling"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "hundeløp"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastikk"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "hesteløp"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "skyting"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skøyter"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "fotball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "svømming"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Bane"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
+
+#. 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 "type"
 
 #. item "Sport/Multi" combo "type"
@@ -19656,203 +19996,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "bane"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "sportssenter"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadion"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Turn"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Rediger motorsport"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -19860,56 +20200,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "slalom"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "langrenn"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snøpark"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "begynner"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "enkel"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "middels"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "vanskelig"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "fristil"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Skyting"
@@ -19917,182 +20257,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerikansk fotball"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Rediger amerikansk fotball"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golfbane"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Rediger rugby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Bygning"
@@ -20100,5 +20440,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -20106,10 +20446,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Rediger offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Rådhus"
@@ -20117,10 +20457,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Rediger rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambassade"
@@ -20128,10 +20468,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Rediger ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Domstol"
@@ -20140,10 +20480,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Rediger domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Fengsel"
@@ -20152,10 +20492,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Rediger fengsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Politi"
@@ -20165,10 +20505,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Rediger politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -20177,10 +20517,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Rediger brannstasjon"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postkontor"
@@ -20188,5 +20528,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Rediger postkontor"
@@ -20194,15 +20534,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Skole"
@@ -20210,10 +20550,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Rediger skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universitet"
@@ -20221,10 +20561,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Rediger universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Høyskole"
@@ -20232,5 +20572,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Rediger høyskole"
@@ -20238,5 +20578,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kino"
@@ -20245,10 +20585,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Rediger kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliotek"
@@ -20257,9 +20597,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Rediger bibliotek"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -20267,10 +20607,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Rediger kunstsenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teater"
@@ -20279,10 +20619,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Rediger teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -20292,5 +20632,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Rediger tilbedelsessted"
@@ -20299,6 +20639,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religion"
@@ -20307,66 +20647,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "unitarisk"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastrisk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -20375,81 +20715,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbyteriansk"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresser"
@@ -20458,5 +20798,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Rediger adresseinformasjon"
@@ -20464,5 +20804,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Husnummer"
@@ -20470,20 +20810,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Landskode"
@@ -20492,5 +20832,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Rediger interpolasjon"
@@ -20498,61 +20838,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "oddetall"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "partall"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20560,25 +20900,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -20586,10 +20926,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Rediger fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -20597,10 +20937,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Rediger vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -20609,37 +20949,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Rediger rørledning"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gass"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -20649,10 +20989,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Kran"
@@ -20660,10 +21000,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Rediger kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -20671,10 +21011,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -20682,10 +21022,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -20693,5 +21033,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
@@ -20699,5 +21039,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -20707,35 +21047,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "vann"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "atom"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "kull"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "solcelle"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -20744,10 +21084,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -20756,5 +21096,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
@@ -20762,10 +21102,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Linjenummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -20776,23 +21116,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -20801,75 +21141,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Spenning"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Fasiliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Toaletter"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefon"
@@ -20878,5 +21218,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Rediger telefon"
@@ -20884,5 +21224,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Mynter"
@@ -20890,5 +21230,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Sedler"
@@ -20896,5 +21236,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -20902,5 +21242,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -20908,15 +21248,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Kredittkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -20925,5 +21265,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Rediger returstasjon"
@@ -20931,35 +21271,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Klær"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Benk"
@@ -20968,31 +21308,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -21063,40 +21403,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "grønn"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "gress"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -21105,30 +21444,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Fontene"
@@ -21137,10 +21476,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -21149,10 +21488,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Stellebord"
@@ -21160,33 +21499,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Rediger stellebord"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -21194,9 +21533,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Rediger Minimarked"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -21204,27 +21543,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Automat"
@@ -21232,5 +21571,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
@@ -21238,88 +21577,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Automatprodukter"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "billetter"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "godter"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "sigaretter"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "foto"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "dyremat"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "leker"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "frimerke"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "sedler"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Slakter"
@@ -21327,9 +21666,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Rediger slakter"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Baker"
@@ -21337,9 +21676,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Rediger baker"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Blomster"
@@ -21347,18 +21686,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Rediger blomster"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Sprit og vin"
@@ -21366,54 +21705,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Rediger sprit og vin"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Dataelektronikk"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Rediger dataelektronikk"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Elektronikk"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Rediger elektronikk"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Rediger hifi"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -21421,9 +21760,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Rediger hagesenter"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -21431,9 +21770,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Rediger jernvarehandel"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -21441,54 +21780,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Rediger byggevare"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Sko"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Rediger sko"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Leker"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Rediger video"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -21496,9 +21835,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Rediger renseri"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -21506,9 +21845,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Rediger vaskeri"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -21516,28 +21855,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Rediger friluftsutstyr"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Rediger sport"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Valuta"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Bank"
@@ -21545,14 +21884,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Rediger bank"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Minibank"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Veksle valuta"
@@ -21560,5 +21899,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Rediger valutaveksling"
@@ -21566,15 +21905,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Rediger minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Helse"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Lege"
@@ -21582,18 +21921,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Rediger lege"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -21601,5 +21940,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Rediger apotek"
@@ -21607,9 +21946,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Sykehus"
@@ -21617,10 +21956,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Rediger sykehus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -21629,5 +21968,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -21636,20 +21975,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -21657,5 +21996,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -21664,59 +22003,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Steder"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Delstat/provins"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Kommune"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -21724,15 +22068,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Storby"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "By"
@@ -21740,10 +22084,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -21751,25 +22095,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Landsby"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
@@ -21777,5 +22121,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Lokalitet"
@@ -21783,10 +22127,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Øy"
@@ -21794,10 +22138,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Rediger øy"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21805,5 +22149,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21811,5 +22155,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -21817,10 +22161,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -21828,10 +22172,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Isbre"
@@ -21839,10 +22183,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Vulkan"
@@ -21850,70 +22194,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Nasjonal"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Tre"
@@ -21922,15 +22266,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Skogsområde"
@@ -21939,5 +22283,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
@@ -21945,17 +22289,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "barskog"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "løvskog"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "blandingsskog"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Skog"
@@ -21964,14 +22308,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -21979,25 +22323,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Steinur"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Fjell"
@@ -22005,10 +22349,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Beite"
@@ -22016,5 +22360,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Rediger beite"
@@ -22022,5 +22366,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -22029,45 +22373,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -22075,25 +22419,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Hage"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Gress"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Friområde"
@@ -22101,10 +22445,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Offentlig"
@@ -22112,20 +22456,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -22133,5 +22477,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -22139,15 +22483,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -22155,9 +22499,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -22165,39 +22509,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -22205,15 +22549,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Millitært"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Rediger millitært"
@@ -22221,55 +22565,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -22279,5 +22623,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -22286,10 +22630,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "ytre linjesegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -22297,5 +22641,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -22304,5 +22648,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -22310,34 +22654,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -22346,15 +22690,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "til linje"
@@ -22362,5 +22706,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Rute"
@@ -22369,5 +22713,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -22375,5 +22719,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Rutetype"
@@ -22445,5 +22789,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22452,17 +22796,17 @@
 msgstr "sykkel"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "vei"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "ferge"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "ski"
@@ -22515,5 +22859,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22522,13 +22866,13 @@
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "tur"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "omkjøring"
@@ -22542,10 +22886,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -22553,31 +22897,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -22586,30 +22930,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -23047,11 +23391,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "uønsket"
@@ -25075,5 +25419,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "light_vann"
@@ -25745,4 +26089,12 @@
 #.
 #. <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"/>
@@ -25767,5 +26119,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "historisk"
@@ -25779,5 +26131,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "steinbrudd"
@@ -25791,5 +26143,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "avfallsdeponi"
@@ -25811,5 +26163,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "vannmagasin"
@@ -25823,5 +26175,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "skog"
@@ -25835,5 +26187,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "gårdstun"
@@ -25856,5 +26208,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "butikker"
@@ -25868,5 +26220,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "industri"
@@ -25880,5 +26232,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "rivningsområde"
@@ -25892,5 +26244,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "byggeområde"
@@ -25904,5 +26256,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "jernbanegrunn"
@@ -25959,7 +26311,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "millitært"
@@ -25973,5 +26325,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "gravlund"
@@ -25984,5 +26336,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "fjelltopp"
@@ -25997,5 +26349,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "isbre"
@@ -26009,5 +26361,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "vulkan"
@@ -26062,8 +26414,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "natur"
@@ -26077,5 +26429,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "krattskog"
@@ -26089,5 +26441,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "beiteområde"
@@ -26101,8 +26453,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "område"
+msgstr ""
 
 #. color water
@@ -26114,5 +26465,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "søle"
@@ -26126,5 +26477,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "strand"
@@ -26202,8 +26553,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "rute"
@@ -26251,7 +26602,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "grense"
@@ -26401,11 +26752,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "sted"
@@ -26453,6 +26804,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "adresse"
@@ -26760,49 +27111,91 @@
 msgstr ""
 
+#~ msgid "File could not be found."
+#~ msgstr "Filen finnes ikke."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Velg minst én oppgave å laste ned"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Klarte ikke laste opp til OSM-API"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Relasjonen har konflikter"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Feil ved tolking"
+
+#~ msgid "File not found"
+#~ msgstr "Fant ikke fila"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Tast inn først de ønskede koordinater."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Velg først et bokmerke"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Skriv inn en søkestreng"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Klarte ikke lese søkeresultat om sted fra tjener"
+
+#~ msgid "name"
+#~ msgstr "navn"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Velg raden du vil kopiere."
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Legg til ny XML kilde i liste."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Du kan endre antall dager mellom advarslene<br>ved å endre denne verdien "
+#~ "i oppstettet 'pluginmanager.warntime'.)"
+
+#~ msgid "Request Update"
+#~ msgstr "Be op Oppdatering"
+
+#~ msgid "error loading metadata"
+#~ msgstr "feil ved lesing av informasjon om data"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "feil ved fårespørsel om oppdatering: ikke zoom-nivå 12"
+
+#~ msgid "requested: {0}"
+#~ msgstr "bestilt: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "feil ved bestilling av oppdatering"
+
+#~ msgid "Move"
+#~ msgstr "Flytt"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Ulagrede endringer"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Noen av nodene er (nesten) på linje"
+
+#~ msgid "Combine Anyway"
+#~ msgstr "Sammenføy uansett"
+
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Du kan bare redigere hjelpesider fra JOSM Online Help"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM hjelpesider"
+
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Feil ved nedlasting av {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A> eller <A "
-#~ "HREF=\"{1}\">norsk (bokmål)</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Du kan bare redigere hjelpesider fra JOSM Online Help"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Bruk objektmal «{0}»"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "sett Lambert sone manuelt (f.eks. for posisjoner mellom to soner)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Først åpne lag (GPX, OSM, mellomlager)"
-
-#~ msgid "Move"
-#~ msgstr "Flytt"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Ulagrede endringer"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Noen av nodene er (nesten) på linje"
-
-#~ msgid "Combine Anyway"
-#~ msgstr "Sammenføy uansett"
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM hjelpesider"
 
 #~ msgid ""
@@ -26858,7 +27251,4 @@
 #~ msgstr "Ingenting er importert."
 
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Følgende feil oppsto under nedlasting:"
-
 #~ msgid "Resolve {0} conflicts in {1} objects"
 #~ msgstr "{0} konflikter må løses i {1} objecter"
@@ -26956,7 +27346,4 @@
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Relasjons-editor: {0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Oppfrisk utvalgslisten"
 
 #~ msgid "Authors: {0}"
@@ -27090,4 +27477,10 @@
 #~ msgid "Select Tableau d'Assemblage"
 #~ msgstr "Velg Tableau d'Assemblage"
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr "sett Lambert sone manuelt (f.eks. for posisjoner mellom to soner)"
+
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Først åpne lag (GPX, OSM, mellomlager)"
 
 #~ msgid "Adjust the position of the WMS layer"
@@ -27336,13 +27729,6 @@
 #~ msgstr "fjerner henvisning fra vei {0}"
 
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html>Klarte ikke laste historikk fra tjeneren. Detaljer:<br>{0}</html>"
-
 #~ msgid "Edit Station"
 #~ msgstr "Rediger stasjon"
-
-#~ msgid "Aborting..."
-#~ msgstr "Avbryter …"
 
 #~ msgid "Import TCX File..."
@@ -27421,4 +27807,10 @@
 #~ "Ikke last opp data etter  denne meldingen."
 
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Bruk objektmal «{0}»"
+
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
@@ -27451,7 +27843,4 @@
 #~ msgstr "Sorter"
 
-#~ msgid "Sort the selected relation members or the whole list"
-#~ msgstr "Sorter valgte relasjonsmedlemmer eller hele listen."
-
 #~ msgid "No data"
 #~ msgstr "Ingen data"
@@ -27459,4 +27848,14 @@
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Fjern relasjonsmedlem {0} {1}"
+
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Hjelpeside mangler. Opprett den på <A HREF=\"{0}\">engelsk</A> eller <A "
+#~ "HREF=\"{1}\">norsk (bokmål)</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 18273)
+++ applications/editors/josm/i18n/po/nl.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-21 08:25+0000\n"
-"Last-Translator: Thomas van der Burgt <Unknown>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-25 13:43+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Hoofdscherm aanmaken"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ongeldige URL negeren: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Waarschuwing"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ongeldige bestands-URL negeren: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Kon bestand ''{0}' niet lezen'.<br> Error is: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Fout"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "ONBEKEND"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Over"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Het informatiescherm tonen."
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Versie {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Laatste verandering op {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java-versie {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Beginpagina"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Probleem melden"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Informatie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Leesmij"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revisie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Bijdrage"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licentie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Over JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Bestand kon niet gevonden worden."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -324,42 +307,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -367,5 +349,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -379,19 +361,19 @@
 "Selecteer minstens één reeds opgeladen knooppunt, weg of relatie a.u.b."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Selecteer de doellaag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Selecteer de doellaag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -400,50 +382,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Geen doel lagen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Knoop toevoegen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Knoop toevoegen door invoeren lengte- en breedtegraad."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Bewerk: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Coördinaten van de nieuwe knoop invoeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Decimale graden gebruiken."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negatieve waarden duiden op het westelijk/zuidelijk halfrond."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -452,5 +434,5 @@
 msgstr "Breedtegraad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -459,27 +441,27 @@
 msgstr "Lengtegraad"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Knopen uitlijnen in een cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "De geselecteerde knopen in een cirkel plaatsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -489,5 +471,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -503,30 +485,28 @@
 msgstr "Gereedschap: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Selecteer minstens vier knopen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -536,84 +516,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Knopen uitlijnen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "De geselecteerde knopen op een lijn plaatsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Selecteer minstens drie knopen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "Laag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "conflict"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "download"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Inzoomen op {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Beeld inzoomen op {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Beeld: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Geen selectie om op in te zoomen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Geen conflicten om op in te zoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -621,37 +601,37 @@
 msgstr "Bestand: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Wegen combineren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Verschillende wegen combineren tot één weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Richting omkeren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Omkeren en combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -661,5 +641,5 @@
 "de richting van enkele omkeren?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -669,41 +649,41 @@
 "reeks van knopen)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} wegen combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Selecteer twee of meer wegen om te combineren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Geselecteerde objecten naar klembord kopiëren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Selecteer iets om te kopiëren"
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Cirkel aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Een cirkel uit drie knopen maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -713,16 +693,14 @@
 "knopen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -734,5 +712,5 @@
 msgstr "Verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Geselecteerde objecten verwijderen."
@@ -740,6 +718,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -753,73 +731,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Knopen verdelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "De geselecteerde knopen equidistant langs een lijn verdelen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Downloaden vanuit OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Kaart downloaden van de OSM-server."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Downloaden"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Selecteer tenminste één taak om te downloaden"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -828,39 +783,39 @@
 msgstr "Parameter ''{0}'' mag niet null zijn"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Er waren {0} tegenstrijdigheden tijdens het importeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Dupliceren"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Dupliceer selectie door kopiëren en direct plakken."
@@ -870,41 +825,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Afsluiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "De applicatie afsluiten."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Alle formaten"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Exporteren naar GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "De gegevens naar een GPX-bestand exporteren."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Geen gegevens om te exporteren, maak deze eerst."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -943,6 +898,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -961,9 +916,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -983,5 +938,5 @@
 msgstr "Parameter \"{0}\" mag niet leeg zijn."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -989,36 +944,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Export GPX bestand"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
 msgstr "Object geschiedenis"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Toon geschiedenis van OSM wegen, knopen of relaties."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Info over element"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Toon objectinformatie over OSM wegen, knopen of relaties."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Knoop aan weg knopen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Koppel een knoop met het dichtstbijzijnde wegsegment"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Knoop en lijn koppelen"
@@ -1028,170 +983,188 @@
 msgstr "Geen sneltoets"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Knopen samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Knopen in de oudste samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Minstens twee knopen selecteren om samen te voegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Afbreken..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Kan knopen niet samenvoegen: zou daarvoor een weg moeten verwijderen die nog "
 "in gebruik is."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "{0} knopen samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Selectie samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Spiegelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Spiegel de geselecteerde knopen en wegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Selecteer ten minste één knoop of weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "omhoog"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Objecten {0} verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "omlaag"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "links"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "rechts"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "{0} verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Verplaatst objecten {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Kan objecten niet buiten de wereld plaatsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Nieuw"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Een nieuwe kaart aanmaken."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Openen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Een bestand openen."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Bestanden aan het openen"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Bestand ''{0}'' aan het openen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Locatie openen…"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Een URL openen."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Laag scheiden"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr "Selecteer als de data naar een nieuwe laag moet worden gedownload"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "URL om te downloaden invoeren"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Geef een URL waarvandaan de data gedownload moet worden"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Locatie downloaden"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Download-URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr "Start het downloaden van data"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "Sluit dialoog en stop het downloaden"
 
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Gegevens worden gedownload"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Vorm orthogonaal maken"
@@ -1201,18 +1174,18 @@
 msgstr "Knopen zodanig verplaatsen dat alle hoeken 90 of 270 graden zijn."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1221,9 +1194,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1232,36 +1205,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr "Gebruik"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Orthogonaal maken"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Plakken"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Inhoud van het buffer plakken."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Tags plakken"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Inhoudtags uit klembord toepassen op alle geselecteerde items."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1270,5 +1244,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1277,59 +1251,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Voorkeuren..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Open het voorkeurenscherm voor algemene instellingen."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Opnieuw uitvoeren"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "De laatste ongedaan gemaakte opdracht herstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Laag hernoemen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Ook het bestand hernoemen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Kon bestand ''{0}'' niet hernoemen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Wegen omkeren"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "De richting van alle geselecteerde wegen omkeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Selecteer minstens één weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Wegen omkeren"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1337,10 +1311,10 @@
 msgstr "Opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Huidige gegevens opslaan."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1391,21 +1365,21 @@
 msgstr "Laag opslaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "De huidige gegevens in een nieuw bestand opslaan."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Alles selecteren"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1415,29 +1389,29 @@
 "incomplete objecten geselecteerd."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Statusrapport tonen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Statusrapport tonen met zinvolle informatie dat aan fouten geweten kan worden"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Hulp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Klembord kopiëren en sluiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1446,18 +1420,18 @@
 msgstr "Sluiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Weg splitsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Een weg bij de geselecteerde knoop splitsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "De huidige selectie kan niet gebruik worden voor splitsen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1465,5 +1439,5 @@
 msgstr[1] "De geselecteerde knopen liggen niet in het midden van enige weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1479,9 +1453,9 @@
 "heeft, Selecteer ook de weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "De geselecteerde knopen hebben niet dezelfde weg gemeen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1489,11 +1463,11 @@
 msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "Je moet twee of meer knopen selecteren om een rondgaande weg te splitsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1522,61 +1496,61 @@
 msgstr "Weg {0} in {1} delen splitsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "GPX-lijnen in-/uitschakelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Teken lijnen tussen rauwe GPS punten."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "De algemene instelling \"{0}\" in-/uitschakelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Wegen losmaken"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Dubbele knopen die door meerdere wegen worden gebruikt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "De knoop is met niets anders verbonden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Geen van deze knopen is met iets anders verbonden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Geen van deze wegknopen is met iets anders verbonden"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "De huidige selectie kan niet worden gebruikt voor het losmaken."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Selecteer één van beide:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Een getagde knoop, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* een knoop die gebruikt is door meer dan een weg, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* een knoop die gebruikt is door meer dan één weg, en één van die wegen, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1585,5 +1559,5 @@
 "weg, of"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1592,5 +1566,5 @@
 "één weg."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1604,9 +1578,9 @@
 "geselecteerd worden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Ongebonden knoop"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1614,80 +1588,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Duplicaatknopen {0} in {1} knopen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Ongedaan maken"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "De laatste opdracht opgedaan maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Alles deselecteren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Alle objecten deselecteren."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Alles deselecteren (focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Alles (escape) deselecteren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Update data"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
 msgstr "Update de objecten in de huidige data laag van de server."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "data aan het updaten"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Selectie updaten"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Update selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Selectie leeg"
@@ -1699,8 +1674,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "Upload alle veranderingen in de huidige data laag naar de OSM server"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1711,5 +1687,5 @@
 "op te lossen</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1717,29 +1693,29 @@
 msgstr "Geen aanpassingen aanwezig om te uploaden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Niets om te uploaden. Creëer eerst gegevens."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Synchroniseer alleen relatie {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Synchroniseer alle gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1753,11 +1729,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Conflicten gedetecteerd"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1768,5 +1744,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1776,23 +1752,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Conflicterende relatie"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1803,28 +1778,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Upload naar OSM API gefaald"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1833,17 +1799,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "{0} object wijzigen"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Upload selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1862,11 +1842,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Inzoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Uitzoomen"
@@ -1946,21 +1926,17 @@
 msgstr "Langzaam vooruit"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "GPS-gegevens worden gedownload"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Gedownloade GPX-gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Rauwe GPS-gegevens"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Gegevens worden gedownload"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1968,27 +1944,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "Geen data in dit gebied gevonden."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap-gegevens"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Download {0} van {1} ({2} te gaan)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Fouten tijdens download"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "data aan het updaten"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Naam van gebruiker."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Negeren"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2000,7 +1987,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Fouten tijdens download"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Fouten tijdens download"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2022,5 +2024,5 @@
 msgstr "Modus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2050,38 +2052,38 @@
 msgstr "geselecteerd"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Knoop in weg voegen en verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Nieuwe node maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Selecteer de node onder de cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2090,14 +2092,14 @@
 msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "Start een nieuwe weg vanaf de node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Weg voortzetten vanaf laatste knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Tekenen beëindigen"
@@ -2117,5 +2119,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren."
@@ -2128,5 +2130,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "De muisknop loslaten om het roteren te stoppen."
@@ -2188,5 +2190,5 @@
 msgstr "Altijd verplaatsen en dialoogvenster niet meer laten zien"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2195,5 +2197,5 @@
 "met dichtstbijzijnde knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2205,4 +2207,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zoom"
@@ -2222,5 +2225,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Zoeken..."
@@ -2321,43 +2323,50 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - object met opgegeven aantal knopen"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alle aangepaste objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alle geselecteerde objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alle incomplete objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>ongetagd</b> - alle objecten zonder tag"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Gebruik <b>|</b> of <b>OR</b> om te combineren met een logische OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Gebruik <b>\"</b> om operanten aan te halen (b.v. als sleutel \":\" bevat)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Gebruik <b>(</b> en <b>)</b> om expressies te groeperen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2367,51 +2376,51 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Start zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Geen overeenkomst gevonden voor ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Zoeken naar ''{0}'' heeft de selectie niet verkleind."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} overeenkomsten gevonden"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2443,26 +2452,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Onverwacht token: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Ontbrekende argumenten voor OR."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Ontbrekend argument voor NOT."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Sluithaak verwacht."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2471,5 +2491,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2568,4 +2588,20 @@
 msgstr "Fietsen afhankelijkheden"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2583,8 +2619,8 @@
 msgstr "Relatie {0} toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Verwijder {0} object"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2665,5 +2701,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Dubbel conflict"
@@ -2699,4 +2735,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "Parameter ''{0}'' mag niet null zijn"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2727,29 +2774,6 @@
 msgstr[1] "Verwijder {0} relaties"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Conflicterende relatie"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Uit relatie verwijderen"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Wegsegment splitsen"
@@ -2757,6 +2781,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2768,5 +2792,5 @@
 "niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2953,15 +2977,30 @@
 msgstr "Automatische tagcorrectie"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Standaardwaarde is ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Configuratiebestand is verminkt in regels {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2970,5 +3009,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2977,5 +3016,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2984,5 +3023,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2991,5 +3030,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2997,5 +3036,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3004,5 +3043,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3011,5 +3050,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3018,5 +3057,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3025,19 +3064,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Voorkeuren opgeslagen op {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kan geen voorkeuren uploaden. Reden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Kan geen voorkeuren van server laden."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3046,5 +3108,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "ONBEKEND"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3066,20 +3148,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "Z"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "W"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "O"
@@ -3090,4 +3172,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3155,14 +3251,14 @@
 msgstr "Waarschuwing: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3170,5 +3266,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3195,6 +3291,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3254,113 +3350,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Oppervlak van weg is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygone weg \"{0}\" is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Lid \"{0}\" in relatie wissen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Weg \"{0}\" met minder dan twee punten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Meer dan een \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Meer dan een \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Meer dan éé \"via\" gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Onbekende rol \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Onbekend lidtype voor \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Geen \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Geen \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Geen \"via\"-knoop of -weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stijl voor beperking {0} is niet gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Binnenweg \"{0}\" is uitwendig."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Niet-weg \"{0}\" in multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Geen buitenweg voor multipolygoon \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Binnenweg \"{0}\" is uitwendig."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3376,11 +3472,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "tekst"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3396,5 +3491,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3405,5 +3499,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3432,5 +3525,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "achtergrond"
@@ -3465,12 +3558,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambert-zone (Frankrijk)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambert-zone (Frankrijk)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3506,10 +3597,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3538,5 +3629,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "spoorweg"
@@ -3553,4 +3644,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3566,33 +3659,33 @@
 msgstr[1] "{0} leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3600,16 +3693,16 @@
 msgstr "Conflict"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Onbekende host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3622,4 +3715,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "\"Dagmelding\" downloaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Opgeloste conflicten toepassen en dialoog sluiten"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3691,74 +3789,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Gebruikersnaam"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "gebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "opties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Deze hulptekst tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Standaard UNIX-geometrieargument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Het omgrensde gebied downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Open bestand (als rawe GPS, indien .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Het omgrensde gebied downloaden als rawe GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Met de opgegeven zoekactie selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Gemaximaliseerd openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "De voorkeuren herstellen op standaardwaarden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "De taal instellen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3767,9 +3865,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "voorbeelden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3779,25 +3877,25 @@
 "zorg dat je wat gegevens laadt voor --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "In plaats van --download=<bbox> kun je ook osm://<bbox> opgegeven\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Bijgewerkte plugins activeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Vroege plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Standaarden instellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3812,11 +3910,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3841,6 +3939,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3941,25 +4039,21 @@
 msgstr "(geen object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "laag niet in lijst."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Probleem tijdens lezen"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Bestand niet gevonden"
+#: ../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
@@ -3983,5 +4077,5 @@
 "deselecteer: deze eigenschap niet voor de geselecteerde objecten instellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4010,24 +4104,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Verwijder {0} object"
-msgstr[1] "Verwijder {0} objecten"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Verwijder {0} object"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "niet verwijderd"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relatie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4039,5 +4130,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4086,5 +4177,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4101,5 +4192,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4299,8 +4390,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4607,6 +4698,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4620,6 +4711,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4677,36 +4768,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4718,5 +4809,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "alles"
@@ -4806,4 +4897,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4814,4 +4907,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4825,49 +4919,82 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Waarden voor alle conflicten invoeren."
+
+#: ../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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4904,6 +5031,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4994,10 +5121,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5064,5 +5188,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5107,4 +5232,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5130,6 +5256,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5138,22 +5264,22 @@
 msgstr[1] "Dit verandert {0} objecten."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Een lege waarde verwijdert de sleutel."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<verschillend>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Waarden aanpassen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5162,69 +5288,73 @@
 msgstr[1] "Eigenschappen van {0} objecten aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Selecteer een sleutel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Selecteer een waarde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Eigenschappen/Lidmaatschappen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Eigenschappen voor geselecteerde objecten."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Lid van"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Eigenschappen bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Uit relatie verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Selectie uit relatie {0} zeker verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "De geselecteerde sleutel in alle objecten verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
@@ -5232,40 +5362,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relaties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Een lijst met alle relaties openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaties: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Een editor voor de geselecteerde relatie openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "De geselecteerde relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Een nieuwe relatie aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "De geselecteerde relatie verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Selecteer één van beide:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "De geselecteerde relatie verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Leden downloaden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5292,5 +5442,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5302,9 +5452,9 @@
 msgstr "Selectie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Laat paneel drijven"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5313,5 +5463,5 @@
 "werkbalk."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik om de paneelinhoud te verkleinen/vergroten"
@@ -5393,5 +5543,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5421,23 +5572,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5446,14 +5597,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5463,9 +5614,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5475,15 +5626,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5491,5 +5642,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5497,20 +5648,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5519,67 +5670,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "De geselecteerde leden omhoog verplaatsen"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "De geselecteerde leden omlaag verplaatsen"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Opgeloste conflicten toepassen en dialoog sluiten"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5588,9 +5738,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5599,41 +5749,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Leden downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5643,17 +5793,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5664,13 +5814,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5684,14 +5834,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5741,58 +5891,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Niet verbonden"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Voer eerst de gewenste coördinaten in."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Kader aanmaken"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "De geselecteerde leden omlaag verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Voer een naam in voor de locatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Selecteer eerst een bladwijzer."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "De geselecteerde leden omhoog verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "De geselecteerde leden omhoog verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5802,26 +5982,78 @@
 "downloaden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Omvattend gebied"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Gegevensbronnen en -soorten"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap-gegevens"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Een weg bij de geselecteerde knoop splitsen."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Rauwe GPS-gegevens"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "De geselecteerde weg bevat niet de geselecteerde knoop."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Als nieuwe laag downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Gebied downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Downloaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Geen GPX-tracks geselecteerd"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Gebied te groot om te downloaden; server zal waarschijnlijk weigeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5829,331 +6061,60 @@
 "server"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Sluit dialoog en stop het downloaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "De geselecteerde leden omhoog verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Selecteer een rij om te bewerken."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Voer een plaats in om naar te zoeken:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Voer een plaats in om naar te zoeken:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Nulwijzeruitzondering, mogelijk ontbreken er wat tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Voer een zoekstring in"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Kan locatiezoekresultaten van server niet lezen"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Voer een plaats in om naar te zoeken:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Locaties"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "naam"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "soort"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "nabij"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Slippy-kaart"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "zoomniveau"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x van"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "naar"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y van"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Tegelnummers"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Zoeken..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Richting om naar land te zoeken"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6511,4 +6472,6 @@
 #. 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" />
@@ -6889,6 +6852,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6954,11 +6918,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6968,6 +6932,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6977,79 +6941,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Naam"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Soort"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "nabij"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Slippy-kaart"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "zoomniveau"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x van"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "naar"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y van"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Tegelnummers"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7130,4 +7361,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7419,9 +7651,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Objecten om te bewerken:"
+msgstr[1] "Objecten om te bewerken:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7517,5 +7749,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7545,59 +7786,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Afbeeldingen van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "GPX inlezen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Geen tijd voor punt {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Kan tijd \"{0}\" van punt {1} x {2} niet lezen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lezen {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lezen {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Geotagged afbeeldingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS-start: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS-einde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "Huidige verschil: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "Tijdzoneverschil: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7605,51 +7846,51 @@
 msgstr[1] "afbeeldingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} binnen de track."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Klok synchroniseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-afbeeldingen (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "De datum in het bestand \"{0}\" kon niet ontleed worden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Afbeelding"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Voer weergegeven datum in (mm/dd/jjjj UU:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Tijdzone GPS-unit (verschil t.o.v. de foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Syncroniseer tijd met GPS-apparaat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Ingevoerde tijd kon niet worden ontleed."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7657,30 +7898,30 @@
 msgstr "GPS-punt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Lijntekening aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Algemene instellingen gebruiken."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Lijnen tussen punten in deze laag tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Geen lijnen tussen punten in deze laag tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Lijntekenopties selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7688,5 +7929,5 @@
 msgstr "Kleur aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7695,5 +7936,5 @@
 msgstr "Standaard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7702,43 +7943,43 @@
 msgstr "Kies een kleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Markers van benoemde punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benoemde trackpunten van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Geluid importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-geluidsbestanden (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Geluidsmarkers van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Afbeeldingen importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Naam: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Beschrijving: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7748,28 +7989,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Beschrijving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Lengte: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7778,5 +8019,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7785,10 +8026,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7798,11 +8039,11 @@
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7812,29 +8053,29 @@
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7845,13 +8086,9 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Geen GPX-track in laag beschikbaar om geluid mee te koppelen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7861,5 +8098,5 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7869,23 +8106,23 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Gegevenslaag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "buiten gedownload gebied"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "versie {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7894,39 +8131,56 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Sluit dialoog en stop het downloaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} verwijderd.)"
+msgstr[1] " ({0} verwijderd.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} bestaat uit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} verwijderd.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "API-versie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8095,6 +8349,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8109,6 +8361,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8295,5 +8545,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8635,20 +8885,19 @@
 msgstr "Taal"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Ingebouwde standaarden ingeschakelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8663,6 +8912,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Update"
@@ -8814,68 +9062,102 @@
 msgstr "Sneltoets"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "De rij om te kopiëren selecteren."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
 msgstr "De geselecteerde bron uit de lijst verwijderen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Een nieuwe laag toevoegen"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "De geselecteerde lijst herladen."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "De geselecteerde bron bewerken."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Data aan het uploaden voor laag ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Voorinstellingenmenu sorteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9081,5 +9363,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Meer informatie over deze functionaliteit"
@@ -9144,16 +9426,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Voorkeuzegroep ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Voorkeuzegroep ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9161,5 +9443,5 @@
 msgstr "Met OSM-server verbinden..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9270,5 +9552,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig"
@@ -9494,5 +9776,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9519,5 +9801,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9525,5 +9807,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9536,5 +9818,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9545,33 +9827,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Verkeerd wachtwoord of gebruikersnaam."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Waarschuwing: het wachtwoord wordt onversleuteld verstuurd."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Gebruikersnaam en wachtwoord opslaan (onversleuteld)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Voer wachtwoord in"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "De basis-URL voor de OSM-server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9579,17 +9861,17 @@
 "Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "URL-basisserver"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM-wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9686,5 +9968,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9693,38 +9975,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9732,19 +10014,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member>-specificatie met ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Ongeldig object met id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9753,7 +10035,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9763,25 +10049,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9789,5 +10075,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9796,5 +10082,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9802,5 +10088,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9809,13 +10095,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "OSM-gegevens voorbereiden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9826,14 +10112,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Downloaden vanuit OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9945,15 +10230,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Plugins bijwerken"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Plugins downloaden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9966,29 +10251,33 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
+msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b."
+msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10000,10 +10289,10 @@
 msgstr "Een fout opgetreden in plugin {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10013,49 +10302,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Laatste plugin-update is meer dan {0} dagen geleden."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Plugins bijwerken"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Plugin niet gevonden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Laatste plugin-update is meer dan {0} dagen geleden."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Je kunt het aantal dagen waarna deze waarschuwing verschijnt<br>instellen "
-"via de configuratieoptie 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Laden van plugin {0} is mislukt. Deze uit de voorkeuren verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Plugin uitschakelen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10065,9 +10363,9 @@
 "rechten heeft om de bestaande plugins te overschrijven."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10077,10 +10375,10 @@
 "\"-plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Volgens de informatie in de plugin, is de auteur {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10089,9 +10387,9 @@
 "fout rapporteert."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Moet de plugin worden uitgeschakeld?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10101,22 +10399,22 @@
 "uit de applicatie te halen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "geen omschrijving beschikbaar"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10125,18 +10423,18 @@
 msgstr[1] "Plugin-informatie van {0} sites downloaden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Geen plugin-informatie gevonden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Alle geïnstalleerde plugins zijn bijgewerkt."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10149,9 +10447,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Ontbrekende plugins downloaden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10166,9 +10464,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10190,19 +10488,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "onbekend"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: versie {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin gebundeld met JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10267,5 +10565,5 @@
 msgstr "(De tekst is reeds gekopieerd naar je klembord.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10274,5 +10572,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10281,5 +10579,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10289,5 +10587,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10297,10 +10595,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10309,5 +10607,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10316,16 +10614,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10335,5 +10633,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10342,5 +10640,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10349,5 +10647,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10356,10 +10654,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10368,10 +10666,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10382,5 +10680,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10390,5 +10688,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10399,5 +10697,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10499,11 +10797,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10646,5 +10937,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -10660,10 +10952,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Oneven"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10671,103 +10963,103 @@
 msgstr "Even"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10821,46 +11113,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-locaties uit EXIF halen"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Mappenscan starten"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Een van de geselecteerde bestanden was leeg!!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Foto's lezen..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kan geen canoniek pad voor map {0} krijgen\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Map {0} scannen"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Leeg bestand in {0} gevonden\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Bestanden uit map {0} halen is mislukt\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Met GPX relateren"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11123,5 +11416,5 @@
 msgstr "Bestand {0} gaat fout"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11134,10 +11427,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11185,13 +11478,13 @@
 msgstr "Kies uit..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Kadaster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Automatisch vullen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11200,13 +11493,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11323,7 +11616,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Coördinaten tonen als"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11343,5 +11635,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11384,13 +11676,13 @@
 msgstr "Kader aanmaken"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11521,22 +11813,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Locatie veranderen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Een nieuwe locatie voor het volgende verzoek instellen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Een nieuwe laag toevoegen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Locatie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11546,5 +11838,5 @@
 "die bekend is bij www.cadastre.gouv.fr .</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Voegt nieuwe laag toe"
@@ -11558,9 +11850,9 @@
 msgstr "Een nieuwe cookie ontvangen (sessie verlopen)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11580,9 +11872,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "De positie van de WMS-laag aanpassen"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11606,5 +11897,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Lege laag"
@@ -11633,5 +11924,5 @@
 msgstr "Omvattende reschthoek gemeente: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11642,18 +11933,18 @@
 "Maak een nieuwe aan."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Fout in bufferstructuur"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Fout in buffer Lambert-zone"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11748,5 +12039,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Geen gegevens geladen."
@@ -12155,7 +12446,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "water"
@@ -12367,32 +12658,32 @@
 msgstr "LiveGPS-laag"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "GPS-track omvatten"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Met gpsd-server verbinden en de huidige locatie in LiveGPS-laag tonen."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Eenmalig centreren"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "De LiveGPS-laag op de huidige locatie centreren."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Automatisch centeren"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "De LiveGPS-laag continu op de huidige locatie centeren."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12481,24 +12772,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12650,4 +12941,9 @@
 msgstr "Firefox-executable"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "laag"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12696,30 +12992,30 @@
 msgstr "Toegestane opdrachten"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Afstandsbediening is gevraagd gegevens uit de API te laden."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Gewenste details: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Wil je dit toestaan?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Remote-controlopdracht bevestigen"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12739,7 +13035,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12748,4 +13042,5 @@
 #: ../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 ""
@@ -12767,25 +13062,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12815,93 +13110,87 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Slippy-kaart"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Auto-zoom: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Tegel laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
 msgstr "Tegelstatus tonen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Update aanvragen"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Alle tegels laden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Zoom vergroten"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Zoom verkleinen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "auto-zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "auto-laden tegels"
 
 #. 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "Slippy-kaart"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Instellingen voor de Slippy-kaartplugin"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Tegelbronnen"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Auto-zoom: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Auto-laden tegels: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Max. zoom |v|: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Max. zoom |v|: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Achtergrond vervagen: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "laden van metadata is mislukt"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "verzocht: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "update aanvragen is mislukt"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -12914,5 +13203,5 @@
 msgstr "Verkregen gegevens iedere minuut naar bestand schrijven."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13074,5 +13363,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Straatnaam"
@@ -13120,29 +13409,29 @@
 msgstr "Selecteer minstens één gesloten weg die samengevoegd moet worden."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13152,33 +13441,33 @@
 "of er geen fouten zijn geïntroduceerd."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Waarden voor alle conflicten invoeren."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Conflicten oplossen"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13393,8 +13682,4 @@
 msgstr "De geselecteerde fouten herstellen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Negeren"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13439,25 +13724,24 @@
 msgstr "Vervang \"{0}\" door \"{1}\" voor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Kustlijnen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Deze test controleert of kustlijnen correct zijn."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Ongeordende kustlijn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Ongeordende kustlijn"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Ongeordende kustlijn"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13479,19 +13763,19 @@
 msgstr "Kruisende wegen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Dubbele knopen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 "Deze test controleert of er geen knopen met precies dezelfde locatie zijn."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13745,4 +14029,8 @@
 msgstr "De geselecteerde bron bewerken."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "De geselecteerde bron uit de lijst verwijderen."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13957,7 +14245,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "gebouw"
@@ -13971,5 +14259,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "gebied"
@@ -13979,9 +14267,9 @@
 msgstr "Niet-gesloten weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Niet-verbonden wegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -13989,17 +14277,17 @@
 "heeft."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Wegeindknoop dicht bij andere snelweg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Wegeindknoop dicht bij andere weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Wegknoop dicht bij andere weg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Wegeindknoop dicht bij andere weg verbonden"
@@ -14093,21 +14381,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS-laag ({0}), in zoom {1} downloaden"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14344,9 +14637,9 @@
 msgstr "Fout in bestandsindeling"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Een lege WMS-laag openen om gegevens uit een bestand in te laden"
@@ -14797,6 +15090,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Referentie"
@@ -15358,5 +15651,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15368,5 +15661,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "oerbos"
@@ -15654,7 +15947,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "ja"
@@ -15803,8 +16096,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "nee"
@@ -15931,31 +16224,4 @@
 msgstr "Een splitsing bewerken"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Soort"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16076,5 +16342,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "woongebied"
@@ -16109,5 +16375,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "toegangsweg"
@@ -16142,5 +16408,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "werkzaamheden"
@@ -16530,12 +16796,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Bedrijf"
@@ -16748,6 +17014,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Stijging"
@@ -17174,5 +17440,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "moeras"
@@ -17705,25 +17971,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Openingstijden"
@@ -17789,24 +18055,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17819,24 +18085,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17849,24 +18115,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17899,6 +18165,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Referentienummer"
@@ -17914,5 +18180,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "ondergronds"
@@ -17926,5 +18192,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Parkeergeld"
@@ -18160,5 +18426,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Schuilplaats"
@@ -18626,5 +18892,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Fietsen"
@@ -18639,5 +18905,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skiën"
@@ -18791,16 +19057,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Archeologische plaats"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Archeologische plaats bewerken"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -18808,55 +19087,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Speelveld"
@@ -18864,35 +19143,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -18906,6 +19185,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -19297,30 +19576,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "sport"
@@ -19330,227 +19609,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "Meervoudig"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "Boogschieten"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "Atletiek"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "Australisch football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "Honkbal"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "Boules"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "Bowling"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "Kanoën"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "Klimmen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "Cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "Cricket netten"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "Croquet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "Fietsen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "Hondenraces"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "Paardensport"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "Football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "Turnen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "Paardenraces"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "Badminton"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "Schieten"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "Skateboarden"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "Schaatsen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "Skiën"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "Voetbal"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "Zwemmen"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "Tafeltennis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
+
+#. 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 "soort"
 
 #. item "Sport/Multi" combo "type"
@@ -19587,203 +19919,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "Sportveld"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "Sportcentrum"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "Stadion"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorracen"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Motorracen bewerken"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
@@ -19791,56 +20123,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "eenvoudig"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Schieten"
@@ -19848,182 +20180,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Football bewerken"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Rugby bewerken"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Gebouwen"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Gebouw"
@@ -20031,5 +20363,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -20037,10 +20369,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Openbare gebouwen bewerken"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -20048,10 +20380,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambassade"
@@ -20059,10 +20391,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -20071,10 +20403,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Gevangenis"
@@ -20083,10 +20415,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Politie"
@@ -20096,10 +20428,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -20108,10 +20440,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -20119,5 +20451,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
@@ -20125,15 +20457,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "School"
@@ -20141,10 +20473,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universiteit"
@@ -20152,10 +20484,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Campus"
@@ -20163,5 +20495,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Campus bewerken"
@@ -20169,5 +20501,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -20176,10 +20508,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliotheek"
@@ -20188,9 +20520,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -20198,10 +20530,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Theater"
@@ -20210,10 +20542,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -20223,5 +20555,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -20230,6 +20562,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religie"
@@ -20238,66 +20570,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "Bahai"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "Boeddhisme"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "Christelijk"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "Hindoestaans"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "Jain"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "Joods"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "Moslim"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "Spirtualist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "Taoist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Benaming"
@@ -20306,81 +20638,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "Anglicaan"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "Baptist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "Katholiek"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "Evangelist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "Luthers"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "Methodist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "Mormoon"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "Orthodox"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "Protestant"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "Quaker"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adressen"
@@ -20389,5 +20721,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Adresinformatie bewerken"
@@ -20395,5 +20727,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Huisnummer"
@@ -20401,20 +20733,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Huisnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Landcode"
@@ -20423,5 +20755,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Adresinterpolatie bewerken"
@@ -20429,61 +20761,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "oneven"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabriek"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Toren"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20491,25 +20823,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -20517,10 +20849,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Windmolen"
@@ -20528,10 +20860,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -20540,37 +20872,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -20580,10 +20912,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Kraan"
@@ -20591,10 +20923,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Baken"
@@ -20602,10 +20934,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -20613,10 +20945,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -20624,5 +20956,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
@@ -20630,5 +20962,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -20638,35 +20970,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -20675,10 +21007,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Verdeelstation bewerken"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -20687,5 +21019,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -20693,10 +21025,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -20707,23 +21039,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -20732,75 +21064,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Voltage"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Toiletten"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefoon"
@@ -20809,5 +21141,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
@@ -20815,5 +21147,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Munten"
@@ -20821,5 +21153,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Briefgeld"
@@ -20827,5 +21159,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -20833,5 +21165,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -20839,15 +21171,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Recycling"
@@ -20856,5 +21188,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -20862,35 +21194,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Kleding"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Bank"
@@ -20899,31 +21231,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20994,40 +21326,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "groen"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "gras"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
@@ -21036,30 +21367,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Verborgen"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Afgesloten"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Fontein"
@@ -21068,10 +21399,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -21080,10 +21411,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -21091,33 +21422,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr ""
@@ -21125,9 +21456,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -21135,27 +21466,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Kiosk bewerken"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -21163,5 +21494,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -21169,88 +21500,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "frisdranken"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Slager"
@@ -21258,9 +21589,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Slager bewerken"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Bakker"
@@ -21268,9 +21599,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Bakker bewerken"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Bloemist"
@@ -21278,18 +21609,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Bloemist bewerken"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21297,54 +21628,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Dranken"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -21352,9 +21683,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Tuincentrum bewerken"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21362,9 +21693,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak"
@@ -21372,54 +21703,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak bewerken"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Videotheek"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -21427,9 +21758,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Stomerij bewerken"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Wasserette"
@@ -21437,9 +21768,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Wasserette bewerken"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -21447,28 +21778,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Buitensportzaak bewerken"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Sportzaak bewerken"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Opticiën bewerken"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Bank"
@@ -21476,14 +21807,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Bank bewerken"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -21491,5 +21822,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -21497,15 +21828,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Huisarts"
@@ -21513,18 +21844,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -21532,5 +21863,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -21538,9 +21869,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -21548,10 +21879,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -21560,5 +21891,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -21567,20 +21898,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -21588,5 +21919,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -21595,59 +21926,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Locaties"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Land bewerken"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Provincie"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Regio"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr ""
@@ -21655,15 +21991,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Dorp"
@@ -21671,10 +22007,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -21682,25 +22018,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
@@ -21708,5 +22044,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr ""
@@ -21714,10 +22050,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Eiland"
@@ -21725,10 +22061,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Eiland bewerken"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21736,5 +22072,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21742,5 +22078,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -21748,10 +22084,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Grotingang bewerken"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Bergtop"
@@ -21759,10 +22095,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Bergtop bewerken"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -21770,10 +22106,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Gletsjer bewerken"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -21781,70 +22117,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Vulkaan bewerken"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Landsgrens"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Boom"
@@ -21853,15 +22189,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Boom bewerken"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Bos"
@@ -21870,5 +22206,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Bos bewerken"
@@ -21876,17 +22212,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "naaldbomen"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "loofbomen"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "gemengd"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Bosbouw"
@@ -21895,14 +22231,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Bosbouw bewerken"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -21910,25 +22246,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Puinhelling"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Puinhelling bewerken"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Kreupelhout"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Kreupelhout bewerken"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr ""
@@ -21936,10 +22272,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Heide"
@@ -21947,5 +22283,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Heide bewerken"
@@ -21953,5 +22289,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -21960,45 +22296,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Weide"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -22006,25 +22342,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Tuin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -22032,10 +22368,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Algemeen"
@@ -22043,20 +22379,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -22064,5 +22400,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -22070,15 +22406,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -22086,9 +22422,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -22096,39 +22432,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr ""
@@ -22136,15 +22472,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -22152,55 +22488,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -22210,5 +22546,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -22217,10 +22553,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "buitensegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "binnensegment"
@@ -22228,5 +22564,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -22235,5 +22571,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -22241,34 +22577,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -22277,15 +22613,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "naar weg"
@@ -22293,5 +22629,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22300,5 +22636,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22306,5 +22642,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22376,5 +22712,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22383,17 +22719,17 @@
 msgstr "fiets"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "straat"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "veerboot"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22446,5 +22782,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22453,13 +22789,13 @@
 msgstr "voet"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "omweg"
@@ -22473,10 +22809,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr ""
@@ -22484,31 +22820,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Netwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "voorgesteld"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "alternatief"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "tijdelijk"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "verbinding"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Kleur (hex)"
@@ -22517,30 +22853,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22978,11 +23314,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "vervallen"
@@ -25006,5 +25342,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "licht_water"
@@ -25676,4 +26012,12 @@
 #.
 #. <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"/>
@@ -25698,5 +26042,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "historisch"
@@ -25710,5 +26054,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "mijnbouw"
@@ -25722,5 +26066,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "vuilstortplaats"
@@ -25742,5 +26086,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "estuarium"
@@ -25754,5 +26098,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "bosbouw"
@@ -25766,5 +26110,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "landbouwgrond"
@@ -25787,5 +26131,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "winkelcentrum"
@@ -25799,5 +26143,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "industrieel"
@@ -25811,5 +26155,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "braakliggend gebied"
@@ -25823,5 +26167,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "ontwikkelingsgebied"
@@ -25835,5 +26179,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "Rangeerterrein"
@@ -25890,7 +26234,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "militair gebruik"
@@ -25904,5 +26248,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "begraafplaats"
@@ -25915,5 +26259,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "berg of -heuveltop"
@@ -25928,5 +26272,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "gletsjer"
@@ -25940,5 +26284,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "vulkaan"
@@ -25993,8 +26337,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "Natuurlijk"
@@ -26008,5 +26352,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "ruig land"
@@ -26020,5 +26364,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "heide"
@@ -26032,8 +26376,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "gebied"
+msgstr ""
 
 #. color water
@@ -26045,5 +26388,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "slikgronden"
@@ -26057,5 +26400,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "strand"
@@ -26133,8 +26476,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "route"
@@ -26182,7 +26525,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "grens"
@@ -26332,11 +26675,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "plaats"
@@ -26384,6 +26727,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "adres"
@@ -26691,22 +27034,62 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Fout tijdens het laden van {0}"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Kan alleen hulppagina's van JOSM Online-hulp bewerken"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Voorkeuze ''{0}'' gebruiken"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgid "File could not be found."
+#~ msgstr "Bestand kon niet gevonden worden."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Selecteer tenminste één taak om te downloaden"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Upload naar OSM API gefaald"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Conflicterende relatie"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Probleem tijdens lezen"
+
+#~ msgid "File not found"
+#~ msgstr "Bestand niet gevonden"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Voer eerst de gewenste coördinaten in."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Selecteer eerst een bladwijzer."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Voer een zoekstring in"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Kan locatiezoekresultaten van server niet lezen"
+
+#~ msgid "name"
+#~ msgstr "naam"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "De rij om te kopiëren selecteren."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "Stel handmatig de Lambert-zone in (b.v. voor locaties tussen twee zones)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Eerst een laag openen (GPX, OSM, buffer)"
+#~ "(Je kunt het aantal dagen waarna deze waarschuwing "
+#~ "verschijnt<br>instellen via de configuratieoptie 'pluginmanager."
+#~ "warntime'.)"
+
+#~ msgid "Request Update"
+#~ msgstr "Update aanvragen"
+
+#~ msgid "error loading metadata"
+#~ msgstr "laden van metadata is mislukt"
+
+#~ msgid "requested: {0}"
+#~ msgstr "verzocht: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "update aanvragen is mislukt"
 
 #~ msgid "Unknown version"
@@ -26715,7 +27098,4 @@
 #~ msgid "position"
 #~ msgstr "positie"
-
-#~ msgid "Aborting..."
-#~ msgstr "Afbreken..."
 
 #~ msgid "different"
@@ -26813,7 +27193,4 @@
 #~ "geselecteerd in de geschiedenislijst."
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "De geselecteerde lijst herladen."
-
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "site-josm.xml of Wiki-paginas toevoegen."
@@ -26824,9 +27201,4 @@
 #~ msgid "Plugin already exists"
 #~ msgstr "Plugin bestaat al"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b."
-#~ msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b."
 
 #~ msgid "Could not download plugin: {0} from {1}"
@@ -27108,4 +27480,16 @@
 #~ msgstr "JOSM Online-hulp"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Kan alleen hulppagina's van JOSM Online-hulp bewerken"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Fout tijdens het laden van {0}"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Voorkeuze ''{0}'' gebruiken"
+
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr "Je kunt met de muis of CTRL+pijltoetsen zoomen en verplaatsen."
@@ -27181,4 +27565,11 @@
 #~ msgid "Download Image from french Cadastre WMS"
 #~ msgstr "Afbeelding van Franse Cadastre WMS downloaden"
+
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Eerst een laag openen (GPX, OSM, buffer)"
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr ""
+#~ "Stel handmatig de Lambert-zone in (b.v. voor locaties tussen twee zones)"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 18273)
+++ applications/editors/josm/i18n/po/pl.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-17 15:09+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-02 18:18+0000\n"
+"Last-Translator: poczciwy <Unknown>\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: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -23,64 +23,64 @@
 "X-Poedit-Basepath: /home/mfloryan/dev/josm/i18n/\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Przygotowywanie interfejsu użytkownika"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Pominięto niepoprawny URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -93,12 +93,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -108,27 +102,26 @@
 msgstr "Uwaga"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Pominięto niepoprawny URL do pliku: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Nie można odczytać pliku ''{0}''.<br> Błąd: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -136,23 +129,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -160,5 +154,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -167,21 +161,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -190,5 +185,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -201,17 +196,9 @@
 msgstr "Błąd"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "NIEZNANA"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "O programie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Wyświetla informacje o programie JOSM."
@@ -219,37 +206,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "OpenStreetMap - Edytor Java"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Wersja {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Ostatnia zmiana o {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Wersja Javy {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Raporty o błędach"
@@ -259,5 +246,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -265,33 +252,29 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Plik Readme"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Wersja"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Autorzy"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licencja"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "O JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Plik nie został odnaleziony."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -319,45 +302,44 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
 msgid "Continue"
-msgstr ""
+msgstr "Kontynuuj"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -365,5 +347,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -376,19 +358,19 @@
 msgstr "Proszę wybrać conajmniej jeden węzeł, drogę lub relację"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Proszę, wybierz warstwę docelową."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Wybierz warstwę docelową"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Połącz"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -399,50 +381,50 @@
 "źródłową<br>''{0}''<br>.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Brak warstw docelowych."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Dodaj węzeł..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Dodaje węzeł po podaniu wysokości i szerokości geograficznej."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Edycja: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Podaj współrzędne nowego węzła."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Użyj stopni dziesiętnych."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Wartości ujemne oznaczają zachodnią/południową półkulę."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -451,5 +433,5 @@
 msgstr "Szerokość"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -458,27 +440,27 @@
 msgstr "Długość"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Wyrównaj węzły na kole"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Przesuwa wybrane węzły tak, aby tworzyły koło."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -488,5 +470,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -502,30 +484,28 @@
 msgstr "Narzędzie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Wybierz co najmniej cztery węzły."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -535,84 +515,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Wyrównaj węzły wzdłuż prostej"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Wybierz co najmniej trzy węzły."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "dane"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "warstwa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "pobrany obszar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Pokaż {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Powiększ aby pokazać: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Widok: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Brak zaznaczenia, które można pokazać"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Brak konfliktów, które można pokazać"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -620,37 +600,37 @@
 msgstr "Plik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Nie ma otwartych changesetów"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Brak otwartych changesetów"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Pobieram otwarte changesety ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Połącz drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Łączy kilka dróg w jedną."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Zmienić kierunek?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Odwróć i połącz"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -660,5 +640,5 @@
 "zmienić kierunek niektórych dróg?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -668,41 +648,41 @@
 "węzłów)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Połącz {0} dróg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Wybierz co najmniej dwie drogi do połączenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopiuje zaznaczone obiekty do schowka."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Proszę wybrać coś do skopiowania."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Utwórz okrąg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Tworzy okrąg na podstawie trzech zaznaczonych węzłów."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Te węzły nie są wewnąrz koła. Porzucam."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -712,16 +692,14 @@
 "lub trzech węzłów."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -733,5 +711,5 @@
 msgstr "Usuń"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Usuwa wybrane obiekty"
@@ -739,6 +717,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -752,11 +730,11 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Rozmieść węzły"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr ""
@@ -764,104 +742,81 @@
 "jednej linii."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Pobierz z OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Pobiera dane mapy z serwera OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Pobieranie"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Należy wybrać przynajmniej jeden element do pobrania"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
 #, java-format
 msgid "Parameter ''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+msgstr "Parametr \"{0}\" nie może być pusty (ang. null)"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Wystąpił/o {0} koflikt/ów podczas importu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Konflikty podczas pobierania."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Powiel"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Powiela zaznaczone obiekty."
@@ -871,41 +826,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Zakończ"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Kończy pracę z programem."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Wszystkie formaty"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Eksportuj do GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Eksportuj dane do pliku GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nie ma nic do wyeksportowania. Utwórz jakieś obiekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -944,6 +899,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -962,9 +917,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -984,5 +939,5 @@
 msgstr "parameter ''{0}'' nie może być pusty (null)"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -990,36 +945,36 @@
 msgstr "Oczekiwałem warstwy danych OSM, bądź GPX. Otrzymałem \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Eksportuj do pliku GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+msgstr "Historia obiektu"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Wyświetl historyczne informacjie o drogach, węzłach i relacjach OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Informacje o elemencie"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Wyświetl informacje obiektowe o węźle, drodze lub relacji OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Połącz węzeł z drogą"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Łączy węzeł z najbliższym odcinkiem drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Połącz węzeł i linię"
@@ -1029,170 +984,188 @@
 msgstr "Brak skrótu"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Scal warstwy"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Włącz  aktualną warstwę do innej."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Połącz węzły"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Scala wybrane węzły z najstarszym."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Proszę wybierz przynajmniej dwa węzły aby scalić."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Przerywanie..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Nie można scalić węzłów - wymagałoby to usunięcia drogi która jest nadal "
 "używana."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Scal {0} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Połącz wybrane elementy."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Włącz wybrane elementy do innej warstwy"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Odbicie lustrzane"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Odwraca zaznoczone węzły i drogi."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Wybierz co najmniej jeden węzeł lub drogę."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "do góry"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Przesuń obiekty {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "na dół"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "w lewo"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "w prawo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Przesuń {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Przesuwa obiekty {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Nie można przenieść zaznaczonych obiektów poza świat."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Nowa"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Tworzy nową mapę"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Otwórz..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Otwiera plik."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Otwieram pliki"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Otwieram plik \"{0}\" ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Otwórz adres..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Otwórz URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Osobna wartwa"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+msgstr "Wybierz jeśli dane mają być załądowane do nowej warstwy"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Podaj adres z którego pobrać dane:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+msgstr "Wprowadź URL z którego powinny być pobierane dane"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Pobierz dane."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Adres URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+msgstr "Rozpocznij pobieranie danych"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
-msgstr ""
+msgstr "Zamknij okno i porzuć pobieranie"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Pobieranie danych"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Korekta prostopadłości"
@@ -1202,18 +1175,18 @@
 msgstr "Przesuwa węzły tak aby wszystkie kąty miały 90 lub 270 stopni"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1222,9 +1195,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1232,37 +1205,41 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+"<html>Używasz projekcji EPSG:4326 co może prowadzić<br>do nizamierzonych "
+"efektów przy wyrównywaniu obiektów.<br>Zmień projekcję aby usunąć to "
+"ostrzeżenie.<br>Kontynuujesz?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+msgstr "Użycie"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Korekta prostopadłości"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Wklej"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Wkleja zawartość schowka."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Wklej znaczniki"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../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:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1271,5 +1248,5 @@
 msgstr[1] "Wklejam tagi {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1278,59 +1255,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Ustawienia..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Otwiera okno ustawień programu."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Powtórz"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Powtarza ostatnio wycofaną czynność."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Zmień nazwę warstwy"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "zmień także nazwę pliku"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Nie mogłem przemianować pliku ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Odwróć kierunek dróg"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Zmienia kierunek wszystkich zaznaczonych dróg na przeciwny."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Proszę zaznaczyć co najmniej jedną drogę."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Odwróć kierunek dróg"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1338,10 +1315,10 @@
 msgstr "Zapisz"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Zapisuje bieżące dane."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1392,21 +1369,21 @@
 msgstr "Zapisz warstwę"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Zapisz jako..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Zapisuje bieżące dane do nowego pliku."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Zaznacz wszystko"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1414,10 +1391,10 @@
 msgstr "Wstecz"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Pokazuje raport konfiguracji programu"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1425,19 +1402,19 @@
 "do informacji o błędzie."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Pomoc: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Raport konfiguracji"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Skopiuj do schowka i zamknij"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1446,18 +1423,18 @@
 msgstr "Zamknij"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Rozdziel drogę"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Rozdziela drogę w zaznaczonym węźle."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1466,5 +1443,5 @@
 msgstr[2] "Wybrane węzły nie są w środku żadnej drogi."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1477,9 +1454,9 @@
 msgstr[2] "Więcej niż jedna droga używa wybrane węzły. Wybierz także drogę."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Wybrane węzły nie współdzielą tej samej trasy."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1488,10 +1465,10 @@
 msgstr[2] "Wybrana droga nie zawiera wszystkich wybranych węzłów."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musisz wybrać dwa lub więcej węzłów aby rozdzielić drogę okrężną."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1518,56 +1495,56 @@
 msgstr "Rozdziel drogę {0} na {1} części"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Przełącz linie łączące punktu GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Rysuj linie pomiędzy punktami GPS."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Przełącza ustawienie globalne \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Rozdziel drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Powiela węzły które używane są przez różne drogi."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Ten węzeł nie jest przyklejony do niczego więcej."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Żaden z tych węzłów nie jest przyklejony do niczego więcej."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Żaden z węzłów tej drogi nie jest przyklejony do niczego więcej."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Bieżące zaznaczenie nie może być użyte do rozdzielenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Wybierz przynajmniej:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Jeden węzęł z tagami lub"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Jeden węzeł który jest użyty przez więcej niż jedną drogę lub"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
@@ -1575,5 +1552,5 @@
 "tych dróg lub"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1582,5 +1559,5 @@
 "drogę, lub"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1589,5 +1566,5 @@
 "niż jedną drogę."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1597,9 +1574,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Rozdzielenie węzła"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1607,80 +1584,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Rozmnóż {0} wezłów w {1} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Cofnij"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Cofa ostatnią czynność."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Odznacz wszystko"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Odznacza wszystkie obiekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Odznacz wszystko (zaznaczenie)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Odznacz wszystko (anulowanie)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+msgstr "Aktualizuj dane"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Odświerz obiekty na aktualnej warstwie pobierając z serwera."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Odświeżanie danych"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Nie znaleziono aktualnego zestawu danych"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+msgstr "Nie znalazłem obiektu o id {0} w zestawie danych."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Aktualizuj zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Nie wybrano elementów do odświerzenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Wybrano zbiór pusty."
@@ -1689,11 +1667,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
 msgid "Upload data"
-msgstr ""
+msgstr "Wysyłam dane"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr "Wyślij wszystkie zmiany w aktualnej warstwie do serwera OSM."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1701,6 +1680,8 @@
 "resolve them first.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+"<html>Powstały nierozwiązywalne automagicznie konflikty w warstwie ''{0}''."
+"<br>Musisz je najpierw rozwiązać.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1708,29 +1689,29 @@
 msgstr "Brak zmian do wysłania."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie ma nic do wysłania. Wprowadź jakieś dane."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+msgstr "Synchronizuję tylko węzeł {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+msgstr "Synchronizuję tylko drogę {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+msgstr "Synchronizuję tylko relację {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Synchronizuj cały zestaw danych"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1744,11 +1725,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+msgstr "Wykryto konflikty"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1759,5 +1740,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1767,23 +1748,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Zamknięto changeset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Sprzeczne relacje"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr "Kliknij aby przerwać i powrócić do edycji."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1794,28 +1774,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Załadunek się <strong>nie</strong> powiódł.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Załadunek do API OSM się nie udał."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Odświeżam element"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1824,17 +1795,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Zmień {0} obiekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr "Zignorowałem wyjątek {0} ponieważ całe pobieranie zostało anulowane."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+msgstr "Wyślij wybrane elementy"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1853,11 +1838,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Powiększ"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Zmniejsz"
@@ -1937,21 +1922,17 @@
 msgstr "Zmniejsza prędkość odtwarzania."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Pobieranie danych GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Pobrane dane GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "czyste dane GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Pobieranie danych"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1959,27 +1940,39 @@
 msgstr "Zignorowałem wyjątek {0} ponieważ całe pobieranie zostało anulowane."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "Nie znaleziono żadnych danych w tym obszarze."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "dane OpenSteetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Pobieranie {0} z {1} (pozostało: {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "The following errors occurred during mass download:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Błędy podczas pobierania"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Odświeżanie danych"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Nazwa użytkownika."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Zignoruj"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Kliknij aby przerwać i powrócić do edycji."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1991,7 +1984,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "usunięte, bądź przesunięte elementy"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "The following errors occurred during mass download:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Błędy podczas pobierania"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Błędy podczas pobierania"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2013,5 +2021,5 @@
 msgstr "Tryb: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2041,54 +2049,54 @@
 msgstr "zaznaczony"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 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:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Utwórz nowy węzeł."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Zaznacz węzeł pod kursorem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
 msgid_plural "Insert new node into {0} ways."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+msgstr[0] "Wstaw w drogę nowy węzeł."
+msgstr[1] "Wstaw w drogę nowe węzły {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 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:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Kontynuuj drogę od ostatniego węzła."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Zakończ rysowanie."
@@ -2108,5 +2116,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2117,5 +2125,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Zwolnij przycisk myszy aby zakończyć obracanie."
@@ -2178,5 +2186,5 @@
 msgstr "Zawsze przesuwaj i nie pokazuj tego okna dialogowego"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2185,5 +2193,5 @@
 "najbliższym węzłem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2193,4 +2201,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Powiększ"
@@ -2210,5 +2219,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Szukaj..."
@@ -2309,42 +2317,49 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - obiekt z podaną liczbą węzłów"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - wszystkie zmienione obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - wszystkie zaznaczone obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - wszystkie niekompletne obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - wszystkie obiekty bez tagów"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Użyj <b>I</b> lub <b>OR</b> by połączyć logicznym \"lub\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Użyj <b>\"</b> aby wpisać operator (np.: jeżeli klucz zawiera :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Użyj <b>(</b> oraz <b>)</b> aby pogrupować wyrażenia"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2354,51 +2369,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Rozpocznij szukanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nie znaleziono nic szukając ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Niczego nie usunięto z zaznaczenia szukając \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Znaleziono {0} pasujących."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr ""
@@ -2426,26 +2441,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Brak argumentów dla operator lub."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Brak argumentu dla operatora nie."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Brak nawiasu zamykającego."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2454,5 +2480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2549,4 +2575,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2564,8 +2606,8 @@
 msgstr "Dodaj relację {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Zmień {0} obiekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2647,5 +2689,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2681,4 +2723,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "Parametr \"{0}\" nie może być pusty (ang. null)"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2709,29 +2762,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Sprzeczne relacje"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Usuń z relacji"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Rozdziel segmenty drogi"
@@ -2739,6 +2769,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2750,5 +2780,5 @@
 "węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Potwierdź usunięcie."
@@ -2934,15 +2964,30 @@
 msgstr "Automatyczna korekcja tagów"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Domyślną wartością jest \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Błąd w pliku konfiguracyjnym w linii {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2951,5 +2996,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2958,5 +3003,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2965,5 +3010,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2972,5 +3017,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2978,5 +3023,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2985,5 +3030,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2992,5 +3037,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2999,5 +3044,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3006,19 +3051,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferencje zostały zapisane na {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Wysłanie preferencji nie powiodło się. Powód: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Pobranie preferencji z serwera nie powiodło się."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3027,5 +3095,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "NIEZNANA"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3047,20 +3135,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "W"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "E"
@@ -3071,4 +3159,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3136,14 +3238,14 @@
 msgstr "Uwaga: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3151,5 +3253,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3176,6 +3278,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3235,113 +3337,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
+#, java-format
+msgid "Deleted member ''{0}'' in relation."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
-#, java-format
-msgid "Deleted member ''{0}'' in relation."
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#, java-format
+msgid "Way ''{0}'' with less than two points."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+msgid "More than one \"from\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
-#, java-format
-msgid "Way ''{0}'' with less than two points."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
-msgid "More than one \"from\" way found."
+msgid "More than one \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+msgid "More than one \"via\" found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-msgid "More than one \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
-msgid "More than one \"via\" found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Nieznana rola \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3357,11 +3459,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "tekst"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3377,5 +3478,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3387,5 +3487,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3416,5 +3515,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "tło"
@@ -3443,12 +3542,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "odwzorowanie Lamberta (Francja)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "odwzorowanie Lamberta (Francja)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3484,10 +3581,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3516,5 +3613,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "tory kolejowe"
@@ -3531,4 +3628,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3546,33 +3645,33 @@
 msgstr[2] "{0} elementów"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3580,16 +3679,16 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Nieznany adres"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3602,4 +3701,8 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Pobieranie wiadomości dnia"
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+msgid "Click to close the dialog"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3663,74 +3766,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Hasło"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "użycie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "opcje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Wyświetl tę pomoc"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Przywróć domyślne ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Ustaw język"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3739,9 +3842,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "przykłady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3749,25 +3852,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Aktywacja zaktualizowanych wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Ładowanie wczesnych wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Zapisywanie domyślnych ustawień"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Ładowanie wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3780,11 +3883,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3809,6 +3912,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3909,25 +4012,22 @@
 msgstr "(brak obiektu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "warstwa nie jest na liście."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Błąd podczas przetwarzania"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Plik nie został odnaleziony"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Kliknij aby przerwać i powrócić do edycji."
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3948,5 +4048,5 @@
 msgstr "nieustawione: nie ustawiaj tej opcji dla zaznaczonych obiektach"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3975,25 +4075,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Zmień {0} obiekt"
-msgstr[1] "Zmień {0} obiekty"
-msgstr[2] "Zmień {0} obiektów"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Usuwa wybrane obiekty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "usunięto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relacja"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4005,5 +4101,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4052,5 +4148,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4067,5 +4163,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4265,8 +4361,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4573,6 +4669,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4586,6 +4682,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4643,36 +4739,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4684,5 +4780,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "wszystkie"
@@ -4772,4 +4868,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4781,4 +4879,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4793,49 +4892,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Podaj wartości dla wszystkich konfliktów."
+
+#: ../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 ""
+
+#: ../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:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Załadunek się <strong>nie</strong> powiódł.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4872,6 +5005,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4958,10 +5091,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5028,5 +5158,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5071,4 +5202,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5094,6 +5226,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5103,22 +5235,22 @@
 msgstr[2] "Ta operacja może zmienić {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Ustawienie wartości na pustą usuwa klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<różne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Zmienić wartości?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5128,69 +5260,73 @@
 msgstr[2] "Zmiana właściwości {0} obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Proszę wybierz klucz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Proszę wybierz wartość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Zaznacz proszę te obiekty, których właściwości chcesz zmienić."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Właściwości/członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Właściwości zaznaczonych obiektów."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Członek"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Dodaj właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Edycja właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Właściwości: {0} / członkostwo: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Właściwości / członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Zmień relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Usuń z relacji"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Usuń wybrany klucz ze wszystkich obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Usuń właściwość"
@@ -5198,40 +5334,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relacje"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Otwiera listę wszystkich relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relacje: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Otwiera okno edycji dla zaznaczonej relacji."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Usuwa zaznaczoną relację."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Utwórz nową relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Usuwa zaznaczoną relację."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Wybierz przynajmniej:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Usuwa zaznaczoną relację."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Pobierz członków"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5258,5 +5414,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5268,9 +5424,9 @@
 msgstr "Zaznaczenie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Oderwij panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5278,5 +5434,5 @@
 "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela"
@@ -5358,5 +5514,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5386,23 +5543,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5411,14 +5568,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5428,9 +5585,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5440,15 +5597,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5456,5 +5613,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5462,20 +5619,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5484,66 +5641,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5552,9 +5709,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5563,41 +5720,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Pobierz członków"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5607,17 +5764,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5628,13 +5785,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5648,14 +5805,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5705,58 +5862,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Nie połączony"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Zakładki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Proszę wcześniej podać wybrane współrzędne."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Tworzenie obszarów."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Proszę podać nazwę lokalizacji."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Wybierz najpierw zakładkę."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min szer."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min dł."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "max szer."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "max dł."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5765,358 +5952,138 @@
 "Adres URL z www.openstreetmap.org (można wkleić adres aby pobrać obszar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Wybrany obszar"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Źródła i rodzaje danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "dane OpenSteetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Rozdziela drogę w zaznaczonym węźle."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "czyste dane GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Wybrana droga nie zawiera wybranego węzła."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Pobierz jako nową warstwę"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Pobierany obszar"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Pobierz"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Usuń zaznaczoną warstwę."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
 "Pobierany obszar jest za duży, prawdopodobnie zostanie odrzucony przez serwer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
 "Pobierany obszar jest OK, prawdopodobnie zostanie zaakceptowany przez serwer"
 
-#. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Wpisz proszę czego szukać"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Nie można odczytać wyników wyszukiwania z serwera."
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Zamknij okno i porzuć pobieranie"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Proszę wybrać wiersz do edycji"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
 msgid "Enter a place name to search for:"
 msgstr "Wpisz nazwę miejsce do odnalezienia:"
 
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Miejsca"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "nazwa"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "rodzaj"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "niedaleko"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "powiększenie"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Mapa \"Slippy\""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "powiększenie"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x - od"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "do"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y - od"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Numery kafelków mapy"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Wpisz nazwę miejsce do odnalezienia:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Szukaj..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+msgid "Click to start searching for places"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6474,4 +6441,6 @@
 #. 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" />
@@ -6852,6 +6821,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6917,11 +6887,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6931,6 +6901,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6940,79 +6910,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Rodzaj"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "niedaleko"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Mapa \"Slippy\""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "powiększenie"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x - od"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "do"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y - od"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Numery kafelków mapy"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Użytkownik"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7093,4 +7330,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7382,9 +7620,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Obiekty do zmiany:"
+msgstr[1] "Obiekty do zmiany:"
+msgstr[2] "Obiekty do zmiany:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7480,5 +7719,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7508,59 +7756,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Obrazy dla {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Wczytaj GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Brak znacznika czasowego dla punktu {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Nie można odczytać czasu \"{0}\" w punkcie {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Wczytywanie {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Nie można znaleźć obrazów z czytelnym znacznikiem czasowym"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Wczytywanie {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Geolokalizowane obrazy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS początek: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS koniec: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "aktualne przesunięcie: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "różnica stref czasowych: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7569,51 +7817,51 @@
 msgstr[2] "obrazów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} wewnątrz ścieżki GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Synchronizuj zegar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Pliki JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Data zawarta w pliku \"{0}\" nie mogła zostać przetworzona."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Plik {0} nie zawiera żadnych danych EXIF o czasie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Obraz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Wpisz pokazaną datę (mm/dd/yyyy HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synchronizuj czas z urządzeniem GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Podany czas nie został rozpoznany."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7621,30 +7869,30 @@
 msgstr "punkt GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Dostosuj rysowanie linii"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Użyj ustawień globalnych."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Rysuj linie pomiędzy punktami na tej warstwie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Wybierz opcje rysowania linii"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7652,5 +7900,5 @@
 msgstr "Dostosuj kolor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7659,5 +7907,5 @@
 msgstr "Domyślny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7666,43 +7914,43 @@
 msgstr "Wybierz kolor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Znaczniki nazwanych punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Nazwane punkty GPS z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importuj dźwięk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Pliki audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Markery audio z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importuj obrazki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Nazwa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7712,28 +7960,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Opis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Długość: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7743,5 +7991,5 @@
 msgstr[2] "{0} tras, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7751,10 +7999,10 @@
 msgstr[2] "{0} punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Przekształć w warstwę danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7764,11 +8012,11 @@
 "za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7778,29 +8026,29 @@
 msgstr "Przekonwertowany z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Pobierz wszystko pomiędzy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Maksymalny obszar na zapytanie:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km kw."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7811,9 +8059,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -7821,5 +8065,5 @@
 "danymi dźwiękowymi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7827,5 +8071,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7833,23 +8077,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Warstwa danych {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "poza pobranym obszarem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7858,39 +8102,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Zamknij okno i porzuć pobieranie"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} usuniętych.)"
+msgstr[1] " ({0} usuniętych.)"
+msgstr[2] " ({0} usuniętych.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "Obiekty na warstwie {0}:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} usuniętych.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8061,6 +8325,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8075,6 +8337,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8244,5 +8504,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8576,20 +8836,19 @@
 msgstr "Język"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8604,6 +8863,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Aktualizuj"
@@ -8677,5 +8935,6 @@
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr ""
-"Musisz ponownie uruchomić JOSM aby niektóre ustawienia stały się aktywne."
+"Należy ponownie uruchomić program JOSM, aby niektóre ustawienia stały się "
+"aktywne."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:80
@@ -8755,68 +9014,102 @@
 msgstr "Skrót"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Przesuwa wybrane węzły tak, aby tworzyły koło."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Dodaj komentarz"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Odśwież listę zaznaczonych obiektów."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Usuwa zaznaczoną relację."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Sortuj menu szablonów"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8996,5 +9289,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Więcej informacji na temat tej funkcji"
@@ -9060,16 +9353,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Grupa szablonów \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Grupa szablonów \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9077,5 +9370,5 @@
 msgstr "Łączenie z serwerem OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9187,5 +9480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Błąd parsowania: błędna struktura dokumentu gpx"
@@ -9411,5 +9704,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9436,5 +9729,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9442,5 +9735,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9453,5 +9746,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9462,50 +9755,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Nieprawidłowe hasło lub nazwa użytkownika."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Uwaga: Hasło nie jest szyfrowane podczas transmisji."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Zapisz nazwę użytkownika i hasło (nieszyfrowane)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Wprowadź hasło"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Logowanie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Adres URL serwera OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Adres URL serwera"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "Hasło OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9602,5 +9895,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9609,38 +9902,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9648,19 +9941,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Niekompletny opis <member> z ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Niedozwolony obiekt z id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9669,7 +9962,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9679,25 +9976,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9705,5 +10002,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9712,5 +10009,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9718,5 +10015,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9725,13 +10022,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Przygotowywanie danych OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9742,14 +10039,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Pobierz z OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9862,15 +10158,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Aktualizuj wtyczki"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Pobierz wtyczki"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9882,29 +10178,35 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
+msgstr[0] "{0} wtyczka została zaktualizowana. Proszę ponownie uruchomić JOSM."
+msgstr[1] "{0} wtyczki zostały zaktualizowane. Proszę ponownie uruchomić JOSM."
+msgstr[2] ""
+"{0} wtyczek zostało zaktualizowanych. Proszę ponownie uruchomić JOSM."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9916,10 +10218,10 @@
 msgstr "Wystąpił błąd we wtyczce {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9929,49 +10231,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Ostatnia aktualizacja wtyczek odbyła się przed {0} dniami."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Aktualizuj wtyczki"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Nie znaleziono wtyczki {0} wymaganej przez wtyczkę {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Nie znaleziono wtyczki: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Ostatnia aktualizacja wtyczek odbyła się przed {0} dniami."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Można zmienić ilość dni, po których pojawia się to ostrzeżenie<br>przez "
-"ustawienie opcji konfiguracyjnej 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Nie można załadować wtyczki {0}. Czy usunąć ją z preferencji?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Zablokuj wtyczkę"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9981,9 +10292,9 @@
 "uprawnienia aby nadpisać istniejące pliki."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9993,10 +10304,10 @@
 "\"."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Zgodnie z informacją zawartą w tej wtyczce jej autorem jest {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10005,34 +10316,34 @@
 "błędu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Czy ta wtyczka ma zostać zablokowana?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
 "unload the plugin."
 msgstr ""
-"Wtyczka została usunięta z konfiguracji. Proszę uruchomić JOSM ponownie aby "
-"wyładować wtyczkę."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+"Wtyczka została usunięta z konfiguracji. Proszę ponownie uruchomić program "
+"JOSM , aby wyładować wtyczkę."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "brak opisu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10042,18 +10353,18 @@
 msgstr[2] "Pobrano informacje o wtyczkach z {0} serwerów"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Nie znaleziono informacji o wtyczce."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Wszystkie zainstalowane wtyczki są aktualne."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10066,9 +10377,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Pobierz brakujące wtyczki"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10083,9 +10394,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10107,19 +10418,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Wersja {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Wtyczka dostarczana wraz z JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10185,5 +10496,5 @@
 msgstr "(Tekst już został skopiowany do schowka.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10192,5 +10503,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10199,5 +10510,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10207,5 +10518,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10215,10 +10526,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10227,5 +10538,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10234,16 +10545,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10253,5 +10564,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10260,5 +10571,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10267,5 +10578,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10274,10 +10585,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10286,10 +10597,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10300,5 +10611,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10308,5 +10619,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10317,5 +10628,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10418,11 +10729,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10565,5 +10869,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolacja adresów"
@@ -10579,10 +10884,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10590,103 +10895,103 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10740,46 +11045,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Pobieranie lokalizacji GPS z EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
+msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Przeglądanie katalogu {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Bład w czasie pobierania obrazów z katalogu {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11033,5 +11339,5 @@
 msgstr "Błąd w pliku {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11044,10 +11350,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11095,13 +11401,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Kataster"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11110,13 +11416,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11224,7 +11530,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Wyświetlaj współrzędne jako"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11242,5 +11547,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11281,13 +11586,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11418,22 +11723,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11441,5 +11746,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11453,9 +11758,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11479,5 +11784,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11499,5 +11804,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Pusta warstwa"
@@ -11526,5 +11831,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11533,18 +11838,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11639,5 +11944,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Nie wczytano żadnych danych."
@@ -12043,7 +12348,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "woda"
@@ -12244,32 +12549,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Wycentruj raz"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Centruj ciągle"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr ""
@@ -12358,24 +12663,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12525,4 +12830,9 @@
 msgstr "Ścieżka do programu Firefox"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Warstwa"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12568,30 +12878,30 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
+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:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
+msgid "Confirm Remote Control action"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-msgid "Do you want to allow this?"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-msgid "Confirm Remote Control action"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-msgid "Remote Control has been asked to create a new node."
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12610,7 +12920,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12619,4 +12927,5 @@
 #: ../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 ""
@@ -12638,25 +12947,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12686,92 +12995,85 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Mapa \"Slippy\""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Powiększ"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+msgid "Show Tile Info"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "powiększenie"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
 msgstr ""
 
@@ -12785,5 +13087,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12945,5 +13247,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nazwa ulicy"
@@ -12987,29 +13289,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13017,33 +13319,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Podaj wartości dla wszystkich konfliktów."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Rozwiąż konflikty"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13250,8 +13552,4 @@
 msgstr "Napraw zaznaczone błędy."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Zignoruj"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13296,24 +13594,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Linie brzegowe"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Ten test sprawdza czy linie brzegowe są poprawne."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Niepołączone drogi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "Odwróć i połącz"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13336,18 +13633,18 @@
 msgstr "Przecinające się drogi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13589,4 +13886,8 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13801,7 +14102,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "budynek"
@@ -13815,5 +14116,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "obszar"
@@ -13823,25 +14124,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Niepołączone drogi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr ""
@@ -13933,21 +14234,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14182,9 +14488,9 @@
 msgstr "Błędny format pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
@@ -14632,6 +14938,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Numer"
@@ -15193,5 +15499,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15203,5 +15509,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "Las naturalny"
@@ -15489,7 +15795,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "tak"
@@ -15638,8 +15944,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "nie"
@@ -15766,31 +16072,4 @@
 msgstr "Edycja skrzyżowania"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Rodzaj"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15911,5 +16190,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "droga lokalna"
@@ -15944,5 +16223,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "droga serwisowa"
@@ -15977,5 +16256,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "w budowie"
@@ -16365,12 +16644,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operator"
@@ -16583,6 +16862,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Wysokość"
@@ -17009,5 +17288,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "marsze"
@@ -17540,25 +17819,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "godziny otwarcia"
@@ -17624,24 +17903,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17654,24 +17933,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17684,24 +17963,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17734,6 +18013,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Numer referencyjny"
@@ -17749,5 +18028,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "podziemny"
@@ -17761,5 +18040,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Opłata"
@@ -17995,5 +18274,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "schronienie"
@@ -18461,5 +18740,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "kolarstwo"
@@ -18474,5 +18753,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "narciarstwo"
@@ -18626,16 +18905,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Wykopaliska archeologiczne"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Edycja wykopalisk archeologicznych"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "pomnik"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Edycja pomnika"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "miejsce pamięci"
@@ -18643,55 +18935,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Edycja miejsca pamięci"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "krzyż przydrożny"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Edycja krzyża przydrożnego"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "kapliczka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Edycja kapliczki"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Rozrywka"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "park wodny"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Edycja parku wodnego"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "plac zabaw"
@@ -18699,35 +18991,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Edycja placu zabaw"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "miejsce do wędkowania"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Edycja miejsca do wędkowania"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "obiekty sportowe"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Edycja stadionu"
@@ -18741,6 +19033,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "wybierz sport:"
@@ -19132,30 +19424,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "sport"
@@ -19165,227 +19457,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "różne sporty"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "łucznictwo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "lekkoatletyka"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "siatkówka"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "bule"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "gra w kule"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kajakarstwo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "wspinaczka"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "krykiet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "krokiet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "kolarstwo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "wyścigi psów"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "jazda konna"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gimnastyka"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "wyścigi konne"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "sporty motorowe"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "strzelectwo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "jazda na deskorolce"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "łyżwiarstwo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "narciarstwo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "piłka nożna"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "pływanie"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "tenis stołowy"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "centrum sportowe"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Edycja centrum sportowego"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "boisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Edycja boiska"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "tor wyścigowy"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Edycja toru wyścigowego"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "pole golfowe"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Edycja pola golfowego"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "miniaturowy golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Edycja miniaturowego golfa"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "różne sporty"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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 "rodzaj"
 
 #. item "Sport/Multi" combo "type"
@@ -19422,203 +19767,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "boisko"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "centrum sportowe"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadion"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "kręgle"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Edycja kręgli"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "lekkoatletyka"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Edycja"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "łucznictwo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "wspinaczka"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "kajakarstwo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "wyścigi psów"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "jeździectwo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "wyścigi konne"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "gimnastyka"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "sporty motorowe"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "łyżwiarstwo"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "jazda na deskorolce"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "pływanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr ""
@@ -19626,56 +19971,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Rodzaj trasy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Poziom trudności"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "dla początkujących"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "łatwa"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "dla ekspertów"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "strzelectwo"
@@ -19683,182 +20028,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sporty z piłką"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "piłka nożna"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "australijski football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "koszykówka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "pole golfowe"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "bule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Edycja boiska do gry w boule"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "gra w kule"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "krykiet"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Edycja boiska do gry w krykieta"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "krykiet - siatki"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Edycja siatek do treningu gry w krykieta"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "krokiet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Edycja miejsca do gry w krokieta"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Edycja miejsca do gry w hokeja"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Edycja miejsca do gry w pelotę"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Edycja miejsca do gry w rugby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "tenis stołowy"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Edycja miejsca do gry w tenis stołowy"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Edycja miejsca do gry w tenisa"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Budynki"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "budynek"
@@ -19866,5 +20211,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "budynek użyteczności publicznej"
@@ -19872,10 +20217,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Edycja budynku użyteczności publicznej"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "ratusz"
@@ -19883,10 +20228,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Edycja ratusza"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "ambasada"
@@ -19894,10 +20239,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Edycja ambasady"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "sąd"
@@ -19906,10 +20251,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Edycja siedziby sądu"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "więzienie"
@@ -19918,10 +20263,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Edycja więzienia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "posterunek policji"
@@ -19931,10 +20276,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Edycja posterunku policji"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "straż pożarna"
@@ -19943,10 +20288,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Edycja posterunku straży pożarnej"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "poczta"
@@ -19954,5 +20299,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Edycja urzędu pocztowego"
@@ -19960,15 +20305,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "przedszkole"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Edycja przedszkola"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "szkoła"
@@ -19976,10 +20321,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Edycja szkoły"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "uniwersytet"
@@ -19987,10 +20332,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Edycja uniwersytetu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "college"
@@ -19998,5 +20343,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Edycja college'u"
@@ -20004,5 +20349,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "kino"
@@ -20011,10 +20356,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Edycja kina"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "biblioteka"
@@ -20023,9 +20368,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Edycja biblioteki"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "centrum kulturalne"
@@ -20033,10 +20378,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Edycja centrum kulturalnego"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "teatr"
@@ -20045,10 +20390,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Edycja teatru"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "miejsce kultu religijnego"
@@ -20058,5 +20403,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Edycja miejsca kultu religijnego"
@@ -20065,6 +20410,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religia"
@@ -20073,66 +20418,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahaizm"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "buddyzm"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "chrześcijaństwo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hinduizm"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "dżinizm"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "judaizm"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikhizm"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "spirytualizm"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoizm"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zaratusztrianizm"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Wyznanie"
@@ -20141,81 +20486,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "kościół anglikański"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptyści"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "kościół katolicki"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "ewangelikalizm"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "świadkowie Jehowy"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "luteranie"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "metodyści"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormoni"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "kościół prawosławny"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "zielonoświątkowcy"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "prezbiterianie"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestanci"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "kwakrzy"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "szyici"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunnici"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresy"
@@ -20224,5 +20569,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Edycja informacji o adresach"
@@ -20230,5 +20575,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Numer domu"
@@ -20236,20 +20581,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nazwa domu"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nazwa miejscowości"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Kod pocztowy"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Kod kraju"
@@ -20258,5 +20603,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Edycja interpolacji adresów"
@@ -20264,61 +20609,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Sposób numeracji domów"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "nieparzyste"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "parzyste"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Obiekty sztuczne"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "zakład produkcyjny"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Edycja zakładu produkcyjnego"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "wieża"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Edycja wieży"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20326,25 +20671,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "wieża ciśnień"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Edycja wieży ciśnień"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "zbiornik gazu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Edycja zbiornika gazu"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "latarnia morska"
@@ -20352,10 +20697,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Edycja latarni morskiej"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "wiatrak"
@@ -20363,10 +20708,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Edycja wiatraka"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "rurociąg"
@@ -20375,37 +20720,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Edycja rurociągu"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gazowa"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "oczyszczalnia ścieków"
@@ -20415,10 +20760,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Edycja oczyszczalni ścieków"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "dźwig"
@@ -20426,10 +20771,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Edycja dźwigu"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "radiolatarnia"
@@ -20437,10 +20782,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Edycja radiolatarni"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "punkt geodezyjny"
@@ -20448,10 +20793,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Edycja punktu geodezyjnego"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "monitoring"
@@ -20459,5 +20804,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Edycja kamery do monitoringu"
@@ -20465,5 +20810,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "źródło energii elektrycznej"
@@ -20473,35 +20818,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Edycja źródła energii elektrycznej"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "wiatrowa"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "wodna"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "cieplna"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "jądrowa"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "węglowa"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "fotowoltaiczna"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "elektrownia"
@@ -20510,10 +20855,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Edycja elektrowni"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "rozdzielnia elektryczna"
@@ -20522,5 +20867,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Edycja rozdzielni elektrycznej"
@@ -20528,10 +20873,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "oznaczenie linii"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "słup elektryczny"
@@ -20542,23 +20887,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Edycja słupa linii wysokiego napięcia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "linia wysokiego napięcia"
@@ -20567,75 +20912,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Edycja linii wysokiego napięcia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Napięcie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "toalety"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Uwagi"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "skrzynka pocztowa"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "telefon"
@@ -20644,5 +20989,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Edycja telefonu"
@@ -20650,5 +20995,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "na monety"
@@ -20656,5 +21001,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "na banknoty"
@@ -20662,5 +21007,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "na karty chipowe"
@@ -20668,5 +21013,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "na karty debetowe"
@@ -20674,15 +21019,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "na karty kredytowe"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "na karty telefoniczne"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "zbiórka odpadów"
@@ -20691,5 +21036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Edycja punktu zbiórki odpadów"
@@ -20697,35 +21042,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "puszki"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "odzież"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "szkło"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "złom"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "ławka"
@@ -20734,31 +21079,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20829,40 +21174,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "zielony"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "trawa"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Ambona myśliwska"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Edycja ambony strzelniczej"
@@ -20871,30 +21215,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Wysokość"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Ukryj"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Zablokuj"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "fontanna"
@@ -20903,10 +21247,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Edycja fontanny"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "woda do picia"
@@ -20915,10 +21259,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Edycja punktu z wodą pitną"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -20926,33 +21270,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Sklepy"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Edycja supermarketu"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "sklepik"
@@ -20960,9 +21304,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Edycja sklepiku"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "kiosk"
@@ -20970,27 +21314,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Edycja kiosku"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "automat sprzedający"
@@ -20998,5 +21342,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Edycja automatu sprzedającego"
@@ -21004,88 +21348,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Sprzedawane produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "bilety komunikacji miejskiej"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "mapy komunikacji miejskiej"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "bilety parkingowe"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "jedzenie"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "napoje"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "słodycze"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "papierosy"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "zdjęcia"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "jedzenie dla zwierząt"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "gazety"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "zabawki"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "znaczki"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "karty SIM"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "vouchery"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "prezerwatywy"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampony"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "torby na odchody"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "rzeźnik"
@@ -21093,9 +21437,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Edycja sklepu mięsnego"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "piekarnia"
@@ -21103,9 +21447,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Edycja piekarni"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "florysta"
@@ -21113,18 +21457,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Edycja kwiaciarni"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "naturalna żywność"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Edycja sklepu z naturalną żywnością"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "monopolowy"
@@ -21132,54 +21476,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "napoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "komputery"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Edycja sklepu komputerowego"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Edycja sklepu z elektroniką"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "sprzęt hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Edycja sklepu ze sprzętem hi-fi"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "meble"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Edycja sklepu meblowego"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "centrum ogrodnicze"
@@ -21187,9 +21531,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Edycja centrum ogrodniczego"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21197,9 +21541,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "sklep DIY"
@@ -21207,54 +21551,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Edycja sklepu DIY (zrób to sam)"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "artykuły biurowe"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Edycja sklepu z artykułami biurowymi"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "fryzjer"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Edycja salonu fryzjerskiego"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "obuwie"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Edycja sklepu obuwniczego"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "zabawki"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Edycja sklepu z zabawkami"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "pralnia chemiczna"
@@ -21262,9 +21606,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Edycja palni chemicznej"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "pralnia samoobsługowa"
@@ -21272,9 +21616,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "wyspa"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "sklep turystyczny"
@@ -21282,28 +21626,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Edycja sklepu ze sprzętem turystycznym"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Edycja sklepu sportowego"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Edycja optyka"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Gotówka"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "bank"
@@ -21311,14 +21655,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Edycja banku"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "kantor"
@@ -21326,5 +21670,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Edycja kantoru"
@@ -21332,15 +21676,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Edycja bankomatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Zdrowie"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "lekarz"
@@ -21348,18 +21692,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Edycja lekarza"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "dentysta"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Edycja dentysty"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "apteka"
@@ -21367,5 +21711,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Edycja apteki"
@@ -21373,9 +21717,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "realizacja recept"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "szpital"
@@ -21383,10 +21727,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Edycja szpitala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr ""
@@ -21395,5 +21739,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -21402,20 +21746,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Numer punktu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Numer telefonu"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)"
@@ -21423,5 +21767,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "weterynarz"
@@ -21430,59 +21774,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Edycja lecznicy weterynaryjnej"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Miejsca"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "kontynent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Edycja kontynentu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "kraj"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Edycja kraju"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "stan"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Edycja stanu"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Edycja regionu"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "okręg"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Edycja okręgu / hrabstwa"
@@ -21490,15 +21839,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "miasto"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Edycja miasta"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "miejscowość"
@@ -21506,10 +21855,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Edycja miejscowości"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "dzielnica"
@@ -21517,25 +21866,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Edycja dzielnicy"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "wieś"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Edycja wsi"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "przysiółek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Edycja wólki"
@@ -21543,5 +21892,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "okolica"
@@ -21549,10 +21898,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Edycja okolicy"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "wyspa"
@@ -21560,10 +21909,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Edycja wyspy"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21571,5 +21920,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21577,5 +21926,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "wejście do jaskini"
@@ -21583,10 +21932,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Edycja wejścia do jaskini"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "wzgórze"
@@ -21594,10 +21943,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Edycja wzgórza"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "lodowiec"
@@ -21605,10 +21954,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Edycja lodowca"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "wulkan"
@@ -21616,70 +21965,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Edycja wulkanu"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Granice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "narodowa"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Edycja granicy narodowej"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "administracyjna"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Edycja granicy administracyjnej"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Edycja granicy politycznej"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "park narodowy"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Edycja granicy parku narodowego"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Zagospodarowanie terenu"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "drzewo"
@@ -21688,15 +22037,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Edycja drzewa"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Nazwa systematyczna"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "las"
@@ -21705,5 +22054,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Edycja lasu"
@@ -21711,17 +22060,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "iglasty"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "liściasty"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "mieszany"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "las"
@@ -21730,14 +22079,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Edycja lasu"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "rezerwat przyrody"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Edycja rezerwatu przyrody"
@@ -21745,25 +22094,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "rumowisko"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Edycja rumowiska"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "busz"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Edycja buszu"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "turnia"
@@ -21771,10 +22120,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Edycja turni"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "wrzosowisko"
@@ -21782,5 +22131,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Edycja wrzosowiska"
@@ -21788,5 +22137,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "zagroda"
@@ -21795,45 +22144,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Edycja zagrody"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "grunty rolne"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Edycja gruntów rolnych"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "łąka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Edycja łąki"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "winnica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Edycja winnicy"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "ogródki działkowe"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Edycja ogródków działkowych"
@@ -21841,25 +22190,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "ogród"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Edycja ogrodu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Trawa"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21867,10 +22216,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "miejsce publiczne"
@@ -21878,20 +22227,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Edycja miejsca publicznego"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Edycja parku"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Teren rekreacyjny"
@@ -21899,5 +22248,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edycja terenu rekreacyjnego"
@@ -21905,15 +22254,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "zabudowa mieszkaniowa"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Edycja zabudowy mieszkaniowej"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "cmentarz"
@@ -21921,9 +22270,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "cmentarz"
@@ -21931,39 +22280,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "handel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Edycja obszaru handlowego"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "biura i usługi"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Edycja obszaru biur i usług"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "teren przemysłowy"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Edycja terenu przemysłowego"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "teren kolejowy"
@@ -21971,15 +22320,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Edycja terenu kolejowego"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "obszar wojskowy"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Edycja obszaru wojskowego"
@@ -21987,55 +22336,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "budowa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Edycja terenu budowy"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "teren pod zabudowę"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Edycja terenu pod zabudowę"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "wysypisko"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Edycja wysypiska śmieci"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "kamieniołom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Edycja komieniołomu"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr ""
@@ -22045,5 +22394,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr ""
@@ -22052,10 +22401,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "zewnętrzny segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "wewnętrzny segment"
@@ -22063,5 +22412,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "ograniczenia skrętu"
@@ -22070,5 +22419,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Edycja ograniczenia skrętu"
@@ -22076,34 +22425,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Ograniczenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "brak skrętu w lewo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "brak skrętu w prawo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "zakaz jazdy prosto"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "zakaz zawracania"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "nakaz skrętu w prawo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "nakaz skrętu w lewo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "nakaz jazdy prosto"
@@ -22112,15 +22461,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "z drogi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "przez węzeł lub drogę"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "do drogi"
@@ -22128,5 +22477,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Trasa"
@@ -22135,5 +22484,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Edytuj trasę"
@@ -22141,5 +22490,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Typ trasy"
@@ -22211,5 +22560,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22218,17 +22567,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "droga"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "prom"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22281,5 +22630,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22288,13 +22637,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "objazd"
@@ -22308,10 +22657,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Opis symboli"
@@ -22319,31 +22668,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Sieć"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "proponowany"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "alternatywny"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "tymczasowy"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "połaczenie"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Kolor (hex)"
@@ -22352,30 +22701,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22813,11 +23162,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "przestarzały"
@@ -24841,5 +25190,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25511,4 +25860,12 @@
 #.
 #. <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"/>
@@ -25533,5 +25890,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "historia"
@@ -25545,5 +25902,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "kamieniołom"
@@ -25557,5 +25914,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "Wysypisko smieci"
@@ -25577,5 +25934,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "Basen"
@@ -25589,5 +25946,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "las"
@@ -25601,5 +25958,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr ""
@@ -25622,5 +25979,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr ""
@@ -25634,5 +25991,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "Teren przemysłowy"
@@ -25646,5 +26003,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25658,5 +26015,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25670,5 +26027,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "Teren kolejowy"
@@ -25725,7 +26082,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "Teren wojskowy"
@@ -25739,5 +26096,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "cmentarz"
@@ -25750,5 +26107,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "szczyt"
@@ -25763,5 +26120,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "lodowiec"
@@ -25775,5 +26132,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "wulkan"
@@ -25828,8 +26185,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr ""
@@ -25843,5 +26200,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr ""
@@ -25855,5 +26212,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "zdrowie"
@@ -25867,8 +26224,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "obszar"
+msgstr ""
 
 #. color water
@@ -25880,5 +26236,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "błoto"
@@ -25892,5 +26248,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "plaża"
@@ -25968,8 +26324,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "droga"
@@ -26017,7 +26373,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "granica"
@@ -26167,11 +26523,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "Miejsce"
@@ -26219,6 +26575,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "adres"
@@ -26526,104 +26882,133 @@
 msgstr ""
 
+#~ msgid "File could not be found."
+#~ msgstr "Plik nie został odnaleziony."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Należy wybrać przynajmniej jeden element do pobrania"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Załadunek do API OSM się nie udał."
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Sprzeczne relacje"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Błąd podczas przetwarzania"
+
+#~ msgid "File not found"
+#~ msgstr "Plik nie został odnaleziony"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Proszę wcześniej podać wybrane współrzędne."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Wybierz najpierw zakładkę."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Wpisz proszę czego szukać"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Nie można odczytać wyników wyszukiwania z serwera."
+
+#~ msgid "name"
+#~ msgstr "nazwa"
+
+#~ msgid "zoom"
+#~ msgstr "powiększenie"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Można zmienić ilość dni, po których pojawia się to ostrzeżenie<br>przez "
+#~ "ustawienie opcji konfiguracyjnej 'pluginmanager.warntime'.)"
+
+#~ msgid "Move"
+#~ msgstr "Przenieś"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Nieznane rozszerzenie pliku."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Niezapisane zmiany"
+
+#~ msgid "Object"
+#~ msgstr "Obiekt"
+
+#~ msgid "Unknown version"
+#~ msgstr "Nieznana wersja"
+
+#~ msgid "true"
+#~ msgstr "prawda"
+
+#~ msgid "false"
+#~ msgstr "fałsz"
+
+#~ msgid "unnamed"
+#~ msgstr "bez nazwy"
+
+#~ msgid "Data Layer"
+#~ msgstr "Warstwa danych"
+
+#~ msgid "my version:"
+#~ msgstr "moja wersja:"
+
+#~ msgid "their version:"
+#~ msgstr "ich wersja:"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Nie można połączyć się z serwerem."
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid "Revert"
+#~ msgstr "Wycofaj"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "Użytkownik OSM (email)"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Używa szablon \"{0}\""
+
+#~ msgid "position"
+#~ msgstr "pozycja"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Usuń {1} {0}"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?"
+
+#~ msgid "Validate"
+#~ msgstr "Zweryfikuj"
+
+#~ msgid "Station"
+#~ msgstr "stacja"
+
+#~ msgid "Edit Station"
+#~ msgstr "Edycja stacji"
+
+#~ msgid "Charge"
+#~ msgstr "Opłata"
+
+#~ msgid "No data imported."
+#~ msgstr "Nie zaimportowano danych."
+
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Błąd w czasie ładowania strony {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A> lub "
-#~ "<A HREF=\"{1}\">swoim języku</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Strony pomocy można edytować tylko z Pomocy Online JOSM"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Używa szablon \"{0}\""
-
-#~ msgid "Move"
-#~ msgstr "Przenieś"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Nieznane rozszerzenie pliku."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Niezapisane zmiany"
-
-#~ msgid "Object"
-#~ msgstr "Obiekt"
-
-#~ msgid "Unknown version"
-#~ msgstr "Nieznana wersja"
-
-#~ msgid "true"
-#~ msgstr "prawda"
-
-#~ msgid "false"
-#~ msgstr "fałsz"
-
-#~ msgid "unnamed"
-#~ msgstr "bez nazwy"
-
-#~ msgid "Data Layer"
-#~ msgstr "Warstwa danych"
-
-#~ msgid "my version:"
-#~ msgstr "moja wersja:"
-
-#~ msgid "their version:"
-#~ msgstr "ich wersja:"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Nie można połączyć się z serwerem."
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid "Revert"
-#~ msgstr "Wycofaj"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "Użytkownik OSM (email)"
-
-#~ msgid "position"
-#~ msgstr "pozycja"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Usuń {1} {0}"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Czy połączyć drogi, które należą do różnych relacji?"
-
-#~ msgid "Validate"
-#~ msgstr "Zweryfikuj"
-
-#~ msgid "Station"
-#~ msgstr "stacja"
-
-#~ msgid "Edit Station"
-#~ msgstr "Edycja stacji"
-
-#~ msgid "Charge"
-#~ msgstr "Opłata"
-
-#~ msgid "No data imported."
-#~ msgstr "Nie zaimportowano danych."
 
 #~ msgid "Open in Browser"
@@ -26654,7 +27039,4 @@
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
 #~ msgstr "Transfer przerwany z powodu błędu (czekam 5 sekund):"
-
-#~ msgid "Aborting..."
-#~ msgstr "Przerywanie..."
 
 #~ msgid "Plugin requires JOSM update: {0}."
@@ -26757,13 +27139,4 @@
 #~ msgstr "Wtyczka już istnieje"
 
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] ""
-#~ "{0} wtyczka została zaktualizowana. Proszę ponownie uruchomić JOSM."
-#~ msgstr[1] ""
-#~ "{0} wtyczki zostały zaktualizowane. Proszę ponownie uruchomić JOSM."
-#~ msgstr[2] ""
-#~ "{0} wtyczek zostało zaktualizowanych. Proszę ponownie uruchomić JOSM."
-
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -26837,9 +27210,9 @@
 #~ msgstr "brona"
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "Odśwież listę zaznaczonych obiektów."
-
 #~ msgid "Merging conflicts."
 #~ msgstr "Rozwiązywanie konflików."
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Strony pomocy można edytować tylko z Pomocy Online JOSM"
 
 #~ msgid "Really mark this issue as ''done''?"
@@ -26996,4 +27369,15 @@
 #~ "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Brak strony pomocy. Utwórz ją w języku <A HREF=\"{0}\">angielskim</A> lub "
+#~ "<A HREF=\"{1}\">swoim języku</A>."
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 18273)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-25 02:19+0000\n"
-"Last-Translator: André Gondim <andregondim@ubuntu.com>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-03 09:50+0000\n"
+"Last-Translator: billymenzl <billymenzl@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:07+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Criando tela principal"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorando URL malformada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Aviso"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando arquivo malformado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Não pode ler o ficheiro ''{0}''.<br> Erro: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Erro"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "DESCONHECIDO"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Sobre"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Mostra a tela de créditos"
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Versão {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Última modificação em {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java versão {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Página inicial"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Relatório de erros"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Info"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Leiame"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revisão"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Contribuições"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licença"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Extensões"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Sobre o JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Arquivo não pode ser encontrado."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -324,42 +307,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -367,5 +349,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -378,19 +360,19 @@
 msgstr "Por favor, selecione pelo menos um nó, caminho ou relação."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Por favor a camada destino"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Selecione camada destino"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -401,50 +383,50 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Sem camadas destino"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Adicionar Nó..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Adicionar nó através da entrada de latitude e longitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Editar: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Digite as coordenadas do novo nó."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Usar casas decimais."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valores negativos são para coordenadas dos hemisférios Sul/Oeste."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -453,5 +435,5 @@
 msgstr "Latitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -460,27 +442,27 @@
 msgstr "Longitude"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Alinhar Nós em círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Mover nós selecionados em um círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -490,5 +472,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -504,30 +486,28 @@
 msgstr "Ferramenta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Por favor, selecione no mínimo 4 nós."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -537,84 +517,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Alinhar Nós em linha"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Mover os nós selecionados para uma linha."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Por favor, selecione no mínimo 3 nós."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "dados"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "camada"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "conflito"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "baixar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Aproximar para {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Aproximar a visão para {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Visão: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Não há nada selecionado para se aproximar."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Não há conflitos para se aproximar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -622,37 +602,37 @@
 msgstr "Arquivo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Combinar Caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Combinar vários caminho em um só"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Inverter direções?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Inverter e Combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -662,5 +642,5 @@
 "algum destes?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -670,41 +650,41 @@
 "único conjunto de nós)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combinar {0} caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Por favor selecione no mínimo 2 caminhos a combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Copiar objetos selecionados para memória de colagem"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Por favor selecione algo a ser copiado"
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Criar Círculo"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Criar círculo a partir de três nós selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Os nós não estão em circulo. Abortando."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -714,16 +694,14 @@
 "nós."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -735,5 +713,5 @@
 msgstr "Excluir"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Excluir os objetos selecionados."
@@ -741,6 +719,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -754,74 +732,51 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Distribuir nós"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Distribuir nós selecionados equidistantemente sobre uma linha."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Baixar do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Baixar mapa do servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Baixar"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "Aceitar"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Por favor selecione no mínimo uma tarefa para baixar"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 "Descarregamento primitivas referenciadas a uma das primitivas selecionadas"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -830,39 +785,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Houve {0} conflitos durante a importação."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Conflitos durante download"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) carregando pais da primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) carregando pais da primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) carregando pais da primitiva {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplicar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicar seleção através de cópia e colagem imediata."
@@ -872,41 +827,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Sair"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Sair do aplicativo."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Todos os formatos"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Exportar para GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exportar dados para arquivo GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nada a exportar. Escolha alguns dados antes."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -945,6 +900,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -963,9 +918,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -985,5 +940,5 @@
 msgstr "parâmetro ''{0}'' não pode ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -991,37 +946,37 @@
 msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Exportar  arquivo GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
 "Mostrar informações de histórico sobre caminhos, nós ou relações do OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Informações sobre Elemento"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Mostrar informações de objeto sobre nós, caminhos ou relações do OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Unir Nó ao Caminho"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Unir um nó ao segmento de caminhos mais próximo"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Unir Nó e Linha"
@@ -1031,169 +986,187 @@
 msgstr "Sem atalho"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Combinar camada"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Combinar camada atual em outra camada"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Unir Nós"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Unir nós no mais antigo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor selecione no mínimo dois nós para unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Interrompendo..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Não é possivel unir nós: Será necessário deletar o caminho que ainda é usado."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Unir {0} nós"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Combinar seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Combinar primitivas selecionadas atualmente em outra camada"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Espelhar"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Espelhar os nós e caminhos selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Por favor selecione ao menos um nó ou caminho."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "acima"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Mover objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "abaixo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "esquerda"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "direita"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Mover {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Move Objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Não é possível mover objetos para fora do planeta."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Novo"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Criar novo mapa."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Abrir um arquivo."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Abrendo arquivos"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Abrendo arquivo \"{0}\" ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Abrir Local..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Abrir uma URL."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Separar camadas"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Digitar URL para baixar:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Transferir Local"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "URL para baixar"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+msgstr "Iniciar baixar dados"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Baixando dados"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Ortogonalizar prancha"
@@ -1203,18 +1176,18 @@
 msgstr "Mover nós ao ponto de todos ângulos serem 90 ou 270 graus"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1223,9 +1196,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1237,32 +1210,33 @@
 "Mude sua projeção para se livrar do presente aviso. <br> Quer continuar?"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Ortogonalizar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Colar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Colar conteúdo da memória"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Colar Tags"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
@@ -1270,5 +1244,5 @@
 "selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1277,5 +1251,5 @@
 msgstr[1] "A colar {0} tags"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1284,59 +1258,59 @@
 msgstr[1] "Para {0} primitivas"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Preferências..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Abrir uma página de preferências para configurações globais"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Refazer"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Refazer a última ação não terminada."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Renomear camada"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Também renomear o arquivo"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Não foi possível renomear arquivo ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Reverter Caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Reverter a direção de todos caminhos selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Favor selecionar no mínimo um caminho."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Reverter caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1344,10 +1318,10 @@
 msgstr "Salvar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Salvar dados atuais"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1398,21 +1372,21 @@
 msgstr "Salvar Camada"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Salvar como..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Salvar os dados atuais para um novo arquivo."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1422,29 +1396,29 @@
 "objetos incompletos também."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Mostrar relatório atual"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Mostrar relatório atual com informações úteis que podem ser anexadas aos bugs"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Ajuda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Relatório Atual"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Copiar para área de transferência e fechar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1453,18 +1427,18 @@
 msgstr "Fechar"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Dividir Caminho"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Dividir caminho no nó selecionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "A seleção atual não pode ser usada para divisões"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1472,5 +1446,5 @@
 msgstr[1] "Os nós selecionados não se encontram no meio de nenhum caminho"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1486,9 +1460,9 @@
 "o caminho também."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Os nós selecionados não compartilham o mesmo caminho."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1496,11 +1470,11 @@
 msgstr[1] "O caminho selecionado não contém todos nós selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 "Você precisa selecionar dois ou mais nós para dividir um caminho circular."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1531,60 +1505,60 @@
 msgstr "Dividir caminho {0} em {1} partes"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Alternar linhas GPX"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Desenhar linhas entre pontos provenientes do gps"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Mudar a configuração global \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Desgrudar caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplicar nós que são usados em caminhos múltiplos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Este nó não esta grudado a nada."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Nenhum destes nós está grudado a algo."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Nenhum dos nós destes caminhos está grudado a algo."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "A seleção atual não pode ser usada para desgrudar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Selecione entre:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Um nó comentado, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Um nó que é usado em mais de um caminho, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Um nó que é usado em mais de um caminho e um destes caminhos, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1592,5 +1566,5 @@
 "* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1598,5 +1572,5 @@
 "* Um caminho e um ou mais de seus nós que são usados por mais de um caminho."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1611,9 +1585,9 @@
 "cópia e todos os nós serão selecionados."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Nó não grudado"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1621,80 +1595,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Duplicar {0} nós em {1} nós"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Desfazer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Desfazer última ação."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Desmarcar todos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Desmarcar todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Desmarcar tudo (Focar)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Desmarcar tudo (Sair)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Atualiza as primitivas selecionadas a partir do servidor"
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Enviando dados"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Atualizar Seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Não há primitivas selecionadas para atualizar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Seleção vazia"
@@ -1706,8 +1681,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1716,5 +1691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1722,29 +1697,29 @@
 msgstr "Não há modificações a enviar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Não há nada a enviar. Baixe dados primeiro."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Synchronizar todo o conjunto de dados"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1765,11 +1740,11 @@
 "</strong> para abortar e continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1784,5 +1759,5 @@
 "<br>Clique <strong>{1}</strong> para abortar e continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1792,23 +1767,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Resolução de Conflito"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1819,29 +1793,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
-"Aviso: cabeçalho de erro \"{0}\" não se encaixa no padrão esperado \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Envio <strong>falhou</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Envio para API OSM falhou"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Atualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1850,17 +1814,33 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Modificar objeto {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"A ignorar a excepção porque a transferência foi cancelada. A excepção foi: "
+"{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1879,11 +1859,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Aproximar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Afastar"
@@ -1963,21 +1943,17 @@
 msgstr "Avanço Lento"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Baixando dados do GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Dados GPX baixados"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Dados GPS brutos"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Baixando dados"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1987,27 +1963,38 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Dados OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Baixando {0} de {1} (faltam {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "Os seguintes erros ocorrem aquando um transferencia em massa:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Erros ao Transferir"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Enviando dados"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "visível (no servidor)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2025,7 +2012,22 @@
 "ignorar.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Primitivas deletadas ou movidas"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Os seguintes erros ocorrem aquando um transferencia em massa:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Erros ao Transferir"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Erros ao Transferir"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2047,5 +2049,5 @@
 msgstr "Modo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2075,38 +2077,38 @@
 msgstr "selecionado"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Adicionar nó em um caminho e conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Criar novo nó."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Selecionar nó sob o cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2115,14 +2117,14 @@
 msgstr[1] "Inserir novo nó em {0} caminhos."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 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:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Continuar caminho a partir do último nó."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Finalizar desenho."
@@ -2142,5 +2144,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Solte o botão do mouse para selecionar os objetos no retângulo."
@@ -2152,5 +2154,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Solte o botão do mouse para parar de girar"
@@ -2215,5 +2217,5 @@
 msgstr "Mover sempre e não mostrar dica outraves"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2222,5 +2224,5 @@
 "próximo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2232,4 +2234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Ampliar"
@@ -2249,5 +2252,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Pesquisar..."
@@ -2349,20 +2351,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nós:</b>... - objeto com um determinado número de nós"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modificado</b> - todos os objetos modificados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selecionados</b> - todos os objetos selecionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incompletos</b> - todos os objetos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>não tagueados</b> - todos objetos não tagueados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2370,5 +2379,5 @@
 "<b>child <i>expr</i></b> - todos objetos filhos que coincidem com a expressão"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2377,17 +2386,17 @@
 "expressão"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Use <b>|</b> ou <b>OR</b> para combinar com \"ou\" lógico"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Usar <b>\"</b> para operadores de aspas (se a chave contém :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> and <b>)</b> para agrupar expressões"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2397,51 +2406,51 @@
 msgstr "Filtro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Iniciar Pesquisa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Não há valores coincidentes para ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nada adicionado à seleção pela busca por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nada foi removido da seleção quando buscado por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Encontrados {0} resultados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2477,26 +2486,40 @@
 "ou relação."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Credencial de autenticação inesperada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Faltam argumentos para \"or\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Falta argumento para \"not\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Fechamento de parenteses esperado."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Número de parametros incorreto para operador de nós."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Valor incorreto de operador de nós: {0}. O operador de nós espera un número "
+"de nós ou um intervalo, por exemplos, os nós:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Número de parametros incorreto para operador de nós."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2507,5 +2530,5 @@
 "de nós ou um intervalo, por exemplos, os nós:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2607,4 +2630,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "Aceitar"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2622,8 +2661,8 @@
 msgstr "Adicionar relação {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Apagar {0} objeto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2706,5 +2745,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Conflito duplo"
@@ -2740,4 +2779,15 @@
 msgstr "não foi possível resolver conflito não-definido"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parâmetro ''{0}'' não pode ser nulo"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2768,33 +2818,6 @@
 msgstr[1] "apagar {0} relação"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Relação conflitando"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Deletar da relação"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>A selecção \"{0}\" é usada pela relação \"{1}\" com o papel {2}."
-"<br>Apagar da relação?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da relação?</"
-"html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Dividir segmento de via"
@@ -2802,6 +2825,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2813,5 +2836,5 @@
 "<br>Realmente quer apagar?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Apagar confirmação"
@@ -3001,15 +3024,30 @@
 msgstr "Correção automática de tags"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Valor padrão é \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Erro no arquivo de configuração nas linhas {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3020,5 +3058,5 @@
 "\"{0}\" não é uma directória."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3029,5 +3067,5 @@
 "preferência \"{0}\" não é uma directória.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3038,5 +3076,5 @@
 "falta da directória da preferência: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3047,5 +3085,5 @@
 "devido a falta da directória da preferência: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3055,5 +3093,5 @@
 "preferências base."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3064,5 +3102,5 @@
 "ficheiro de preferência base."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3073,5 +3111,5 @@
 "de preferências base: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3083,5 +3121,5 @@
 "preferências base.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3092,19 +3130,42 @@
 "preferências para original: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Preferências gravadas em {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Não foi possível enviar preferências. Motivo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Não foi possível obter preferências do servidor."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3113,5 +3174,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "DESCONHECIDO"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3133,20 +3214,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "O"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "L"
@@ -3157,4 +3238,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3222,14 +3317,14 @@
 msgstr "Aviso: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3237,5 +3332,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3262,6 +3357,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3325,113 +3420,113 @@
 msgstr "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Caminho para Estilo de Área não está fechado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "via multipolígonos \"{0}\" não está fechada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Apagado membro ''{0}'' na relação."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Way ''{0}'' com menos de dois pontos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Mais de um caminho \"de\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Mais de um caminho \"para\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Encontrado mais de um parâmetro \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Regra desconhecida \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de membro desconhecido para \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Nenhum caminho \"de\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Nenhuma caminho \"para\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Não encontrei nenum nó ou caminho com o parâmetro \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "O caminho \"de\" não começa ou termina em um nó \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "O trecho \"to\" não começa ou termina no nó \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "O trecho \"from\" não começa ou termina no caminho \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "O trecho \"to\" não começa ou termina em um nó \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Estilo para restrição {0} não encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Interseção entre as vias \"{0}\" e \"{1}\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Via interna \"{0}\" está fora."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Regra não aplicável ''{0}'' para Way ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "\"{0}\" não é um caminho no multipolígono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Não há via externa no multipolígono \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Interseção entre as vias \"{0}\" e \"{1}\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Via interna \"{0}\" está fora."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Estilo para caminho interno \"{0}\" é multipolígono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3447,11 +3542,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "texto"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3470,5 +3564,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3479,5 +3572,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3506,5 +3598,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "segundo plano"
@@ -3538,12 +3630,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Zona Lambert (França)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Zona Lambert (França)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3579,10 +3669,10 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3611,5 +3701,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "ferrovia"
@@ -3626,4 +3716,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3639,33 +3731,33 @@
 msgstr[1] "{0} membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Violação de Pré-condição"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Exceção de segurança"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Exceção de rede"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "Excepção IO"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Requisição inválida"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3673,16 +3765,16 @@
 msgstr "Conflito"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Servidor desconhecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3695,4 +3787,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Baixando \"Mensagem do Dia\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Fechar a janela"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3762,74 +3859,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Nome do Usuário"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Senha"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "opções"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Mostar essa ajuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Argumento padrão de geometria unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Baixar o retângulo limite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Abrir arquivo (como raw gps, se .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 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:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Selecionar dentro da busca"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Executar em modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Resetar preferência para default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Escolha o idioma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/TRILHA/PARA/PASTA/DO/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3838,9 +3935,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3851,25 +3948,25 @@
 "alguma coisa antes de --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Em vez de --download=<bbox>, você pode especificar osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Ativando plugins atualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Carregando plugins anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Aplicando padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Carregando plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3882,11 +3979,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3911,6 +4008,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4011,25 +4108,22 @@
 msgstr "(nenhum objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "Usuário:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "camada não está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Camada ''{0}'' precisa estar na lista de camadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Erro enquanto analisando"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Arquivo não encontrado"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Não, cancelar operação"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4052,5 +4146,5 @@
 msgstr "não-definido: não defina esta propriedade nos objetos selecionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4079,24 +4173,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Apagar {0} objeto"
-msgstr[1] "Apagar {0} objetos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Apagar {0} objeto"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "não apagado"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relação"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4108,5 +4199,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4155,5 +4246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4170,5 +4261,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4389,8 +4480,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4716,6 +4807,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4729,6 +4820,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4786,36 +4877,36 @@
 msgstr "Seus dados não inclui uma tag com a chave {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Aplicar"
@@ -4827,5 +4918,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "todos os números"
@@ -4915,4 +5006,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4923,4 +5016,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4934,49 +5028,83 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Substituir"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Regra:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Definir uma papel para membros selecionados"
+
+#: ../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 ""
+
+#: ../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:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Envio <strong>falhou</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Valor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -5013,6 +5141,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5101,10 +5229,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5171,5 +5296,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5214,4 +5340,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Ativar"
@@ -5237,6 +5364,6 @@
 msgstr "Informação sobre camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5245,22 +5372,22 @@
 msgstr[1] "Isto modificará {0} objetos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Um valor vazio apaga a chave."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<diferente>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Modificar valores?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5269,69 +5396,73 @@
 msgstr[1] "Modificar propriedades de até {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Por favor, selecione uma chave"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Por favor, selecione um valor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Por favor, selecione os objetos que deseja modificar propriedades."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Propriedades/Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Propriedades dos objetos selecionados."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Membro de"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Adicionar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Editar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriedades: {0} / Membros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Propriedades / Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Modificar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Deletar da relação"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, 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/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Excluir a chave selecionada em todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Excluir Propriedades"
@@ -5339,40 +5470,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Abrir uma lista de de todas as relações."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relações: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Abrir um editor para a relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Excluir a relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Criar uma nova relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Criar uma cópia desta relação e abri-la em outra janela de edição"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Excluir a relação selecionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Selecione entre:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Baixar relações selecionadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Baixar membros"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5399,5 +5550,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5409,9 +5560,9 @@
 msgstr "Seleção: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Desacoplar painel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5419,5 +5570,5 @@
 "Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Clique para minimizar/maximizar o conteúdo do painel"
@@ -5499,5 +5650,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Baixar membros do relaçoe"
@@ -5527,23 +5679,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Tags e Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr "Relações de parentesco"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5552,14 +5704,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr "Apagá-los, limpar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorá-los, deixar relação como está"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5569,9 +5721,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr "Múltiplos membros referenciando a mesma primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5581,5 +5733,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5588,5 +5740,5 @@
 "membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5595,5 +5747,5 @@
 "membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5603,5 +5755,5 @@
 "membro selecionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5611,20 +5763,20 @@
 "membro selecionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor de Relações: Remover Selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5633,67 +5785,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Classificar a relação de membros"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "Editor de Relações: Classificar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Mover os membros selecionados para cima"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "Editor de Relações: Mover para cima"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Mover membros selecionados para baixo"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "Editor de Relações: Mover para Baixo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "Editor de Relações: Remover"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Aplicar a resolução de conflitos e fechar a janela"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5702,9 +5853,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5713,41 +5864,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Aplicar atualizações e fechar aviso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Cancelar atualizações e fechar janela"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Adicionar uma tag vazia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Baixar todas vias imcompletas e nós desta relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Baixar membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr "Editor de Relações: Baixar Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Definir uma papel para membros selecionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Aplicar papel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5757,17 +5908,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Editar relação referente à relação selecionada atualmente"
@@ -5778,13 +5929,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5798,14 +5949,14 @@
 msgstr "Vinculado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr "Baixar relações referentes"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5855,60 +6006,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Não conectada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Classificar a relação de membros"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Classificar a relação de membros"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Favoritos"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Por favor, entre com as coordenadas desejadas primeiro."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Criar áreas"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Editar relação selecionada atualmente"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Por favor, entre com um nome para a location."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Selecione um favorito primeiro"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Mover os membros selecionados para cima"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Mover os membros selecionados para cima"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "lat mín"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "lon mín"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "lat máx"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "lon máx"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5918,22 +6097,74 @@
 "área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Retângulo Limite"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Fontes e tipos de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Dados OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Dividir caminho no nó selecionado"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Dados GPS brutos"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "O caminho selecionado não contém o nó selecionado."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Baixar como nova camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Baixar Área"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Baixar"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Excluir camada selecionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5941,340 +6172,62 @@
 "servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Área para baixar ok, possívelmente será aceito pelo servidor"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Editar relação selecionada atualmente"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Por favor, selecione a linha para editar."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Forneça o nome de um lugar a procurar:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Forneça o nome de um lugar a procurar:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 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:168
-msgid "Please enter a search string"
-msgstr "Por favor, entre com texto de busca"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Não foi possível ler resultados de busca de place do servidor"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Forneça o nome de um lugar a procurar:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Lugares"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "nome"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "tipo"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "próximo"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Slippy map"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "nível de zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x de"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "para"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y de"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Número de quadros"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Fechar a janela"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"histórico não foi inicializado ainda. Falha ao definir primitiva de "
-"referência."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-"Falha ao difinir referência. Versão de referência {0}  dnão disponível no "
-"histórico"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr "Histórico não inicializado ainda. Falha ao definir primitivo atual."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-"Falha ao definir atual. Versão atual {0} não está disponível no histórico"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Carregar histórico"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Nó {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Caminho {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Pesquisar..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+msgid "Click to start searching for places"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6632,4 +6585,6 @@
 #. 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" />
@@ -7010,6 +6965,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7075,11 +7031,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7089,6 +7045,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7098,79 +7054,351 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Tipo"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "próximo"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Slippy map"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "nível de zoom"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x de"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "para"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y de"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Número de quadros"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Fechar a janela"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+"histórico não foi inicializado ainda. Falha ao definir primitiva de "
+"referência."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+"Falha ao difinir referência. Versão de referência {0}  dnão disponível no "
+"histórico"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr "Histórico não inicializado ainda. Falha ao definir primitivo atual."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+"Falha ao definir atual. Versão atual {0} não está disponível no histórico"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Carregar histórico"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Nó {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Caminho {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Usuário"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7251,4 +7479,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7540,6 +7769,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0} objecto a modificar:"
@@ -7640,5 +7869,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7668,59 +7906,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Imagens para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Ler GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Sem tempo para ponto {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Não foi possível ler tempo \"{0}\" para ponto {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Lendo {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Não foram encontradas imagens com dados de tempo legíveis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Lendo {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Imagens Geotagueadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Iniciar GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Finalizar GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "delta atual: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "diferença de zona horária: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7728,51 +7966,51 @@
 msgstr[1] "imagens"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} dentro da faixa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Sincronizar relógio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Imagens JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "A data no arquivo \"{0}\" não pode ser analisada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Imagem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Zona horária do GPS (diferença com foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Sincronizar Tempo com Unidade GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "O tempo informado não pode ser analisado."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7780,30 +8018,30 @@
 msgstr "ponto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizar linha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Usar preferências globais."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Desenhar linhas entre pontos para esta camada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Não desenhar linhas entre pontos para esta camada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Selecionar opções de linha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7811,5 +8049,5 @@
 msgstr "Personalizar cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7818,5 +8056,5 @@
 msgstr "Padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7825,43 +8063,43 @@
 msgstr "Selecionar uma cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Marcadores de Pontos Nomeados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importar Áudio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Árquivos de Áudio WAV (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importar imagens"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Descrição: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7871,28 +8109,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Descrição"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Comprimento: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7901,5 +8139,5 @@
 msgstr[1] "{0} rotas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7908,10 +8146,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Converter para camada de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7921,11 +8159,11 @@
 "arriscado.<br> Se quiser enviar dados, consulte aqui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7935,29 +8173,29 @@
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Descarregar do OSM ao largo desta via"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Descargar tudo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Área máxima por pedio:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7968,13 +8206,9 @@
 "Você deseja </br> continuar? </html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Não há trilha GPX disponível na camada para associar áudio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7982,5 +8216,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7988,23 +8222,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Camada de dados {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "fora da área baixada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "versão {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8013,39 +8247,55 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} apagado.)"
+msgstr[1] " ({0} apagado.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consiste em:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} apagado.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "remover definição"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "Versão API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8211,6 +8461,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8225,6 +8473,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8405,5 +8651,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8731,20 +8977,19 @@
 msgstr "Idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8759,6 +9004,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Atualizar"
@@ -8909,68 +9153,106 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Ativar"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Pagina: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Versão: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Copiar padrões"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Remover as entradas selecionadas da lista de elementos combinados"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Editar o valor da chave selecionada para todos objetos"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "Remover as entradas selecionadas da lista de elementos combinados"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Adicionar uma nova camada"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Atualizar lista de seleção"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Editar relação selecionada atualmente"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "A enviar informação para a camada \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html> Falha ao carregar histórico a partir do servidor. Detalhes: <br> {0} "
+"</ html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9150,5 +9432,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Mais informações sobre esta característica"
@@ -9213,16 +9495,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Grupo de preferências \"{0}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Grupo de preferências \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9230,5 +9512,5 @@
 msgstr "Contatando servidor OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9339,5 +9621,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Erro de interpretação: estrutura inválida para documento gpx"
@@ -9563,5 +9845,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9588,5 +9870,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9594,5 +9876,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9605,5 +9887,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9614,50 +9896,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Senha ou usuário incorreto."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Atenção: A senha é enviada sem encriptação."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Salvar usuário e senha (sem encriptação)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Digite a Senha"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM senha"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9754,5 +10036,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9761,38 +10043,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9800,19 +10082,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificação de <member> incompleta com ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Objeto ilegal com id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9821,7 +10103,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9831,25 +10117,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9857,5 +10143,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9864,5 +10150,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9870,5 +10156,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9877,13 +10163,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Preparando dados OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9894,14 +10180,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Baixar do OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -10014,15 +10299,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Atualizar Plugins"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10035,29 +10320,33 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10069,10 +10358,10 @@
 msgstr "Um erro ocorreu com o plugin {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10082,49 +10371,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Última atualização de plugin há mais de {0} dias."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Atualizar Plugins"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "O plugin {0} é requerido pelo plugin {1} mas não foi encontrado."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Plugin não encontrado: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Última atualização de plugin há mais de {0} dias."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Você pode alterar o número de dias depois que este irá "
-"aparecer<br>definindo a opção de configuração 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Não foi possível carregar plugin {0}. Apagar das preferências?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Desabilitar plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10134,9 +10432,9 @@
 "de sobreescrever os existentes."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10144,10 +10442,10 @@
 msgstr "Uma exceção não esperada pode ter ocorrido devido ao plugin ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "De acordo com as informações no plugin, o autor é {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10156,9 +10454,9 @@
 "bug."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "O plugin deve ser desabilitado?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10168,22 +10466,22 @@
 "desativar o plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Informações sobre o plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "sem descrição disponível"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Mais detalhes"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10192,18 +10490,18 @@
 msgstr[1] "Informações de plugin baixadas de {0} sites"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Não foi possível encontrar informações de plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Todos os plugins estão atualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10216,9 +10514,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Baixando plugins que faltam"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10233,9 +10531,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10257,19 +10555,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "Desconhecido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versão {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin que vem junto com o JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10333,5 +10631,5 @@
 msgstr "(O texto já foi copiado para a Área de Transferência)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10340,5 +10638,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10347,5 +10645,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10355,5 +10653,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10365,10 +10663,10 @@
 "dados atual viola uma pré-condição.<br>A mensagem de erro é:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10377,5 +10675,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10384,16 +10682,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10403,5 +10701,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10410,5 +10708,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10417,5 +10715,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10424,10 +10722,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10436,10 +10734,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10450,5 +10748,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10458,5 +10756,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10467,5 +10765,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10569,11 +10867,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10716,5 +11007,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolação de Endereços"
@@ -10730,10 +11022,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Ímpar"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10741,103 +11033,103 @@
 msgstr "Par"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10889,46 +11181,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
+msgstr "Mover a camada selecionada uma linha acima."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11180,5 +11473,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11191,10 +11484,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11242,13 +11535,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11257,13 +11550,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11373,7 +11666,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Mostra coordinados como"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11391,5 +11683,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11430,13 +11722,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11567,22 +11859,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Adicionar uma nova camada"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Localidade"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11590,5 +11882,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11602,9 +11894,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11627,5 +11919,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11647,5 +11939,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr ""
@@ -11674,5 +11966,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11681,18 +11973,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11787,5 +12079,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Sem dados carregados."
@@ -12191,7 +12483,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "água"
@@ -12392,32 +12684,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12506,24 +12798,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12667,4 +12959,9 @@
 msgstr ""
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Layer"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12710,30 +13007,30 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
+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:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
+msgid "Confirm Remote Control action"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-msgid "Do you want to allow this?"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-msgid "Confirm Remote Control action"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-msgid "Remote Control has been asked to create a new node."
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12752,7 +13049,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12761,4 +13056,5 @@
 #: ../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 "Roteamento"
@@ -12780,25 +13076,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Critério"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../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:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "Mais rápido"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12828,92 +13124,86 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Ampliar"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Mostrar informações"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "imagen "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "nível de zoom"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
 msgstr ""
 
@@ -12927,5 +13217,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13087,5 +13377,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nome do rua"
@@ -13129,29 +13419,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13159,33 +13449,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Entrada de valores para todos conflitos"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Resolver conflitos"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13390,8 +13680,4 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignorar"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13436,24 +13722,23 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "costa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "Inverter e Combinar"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13476,18 +13761,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Confirmação"
@@ -13728,4 +14013,8 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr ""
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13940,7 +14229,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr ""
@@ -13954,5 +14243,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr ""
@@ -13962,25 +14251,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr ""
@@ -14072,21 +14361,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14319,9 +14613,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
@@ -14767,6 +15061,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Referência"
@@ -15328,5 +15622,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15338,5 +15632,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "madeira"
@@ -15624,7 +15918,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "sim"
@@ -15773,8 +16067,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "não"
@@ -15901,31 +16195,4 @@
 msgstr "Editar Junção"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Tipo"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16046,5 +16313,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr ""
@@ -16079,5 +16346,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "serviço"
@@ -16112,5 +16379,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "construção"
@@ -16500,12 +16767,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operador"
@@ -16718,6 +16985,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Altitude"
@@ -17144,5 +17411,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr ""
@@ -17675,25 +17942,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Horário de Funcionamento"
@@ -17759,24 +18026,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17789,24 +18056,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17819,24 +18086,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17869,6 +18136,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Número de Referência"
@@ -17884,5 +18151,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
@@ -17896,5 +18163,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Taxa"
@@ -18130,5 +18397,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Abrigo"
@@ -18596,5 +18863,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr ""
@@ -18609,5 +18876,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr ""
@@ -18761,16 +19028,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Sítio Arqueológico"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Editar Sítio Arqueológico"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Editar Monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Memorial"
@@ -18778,55 +19058,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Editar Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Editar Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Lazer"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Parque Aquático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Editar Parque Aquático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Parquinho"
@@ -18834,35 +19114,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Editar Parquinho"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Pescaria"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Editar Pescaria"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Esportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Estádio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Editar Estádio"
@@ -18876,6 +19156,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "selecionar esporte:"
@@ -19267,30 +19547,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "esporte"
@@ -19300,227 +19580,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "arco e flecha"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "futebol australiano"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basquete"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "boliche"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "canoagem"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "críquete"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "corrida de cachorros"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "futebol americano"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golfe"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "ginástica olímpica"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hóquei"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "corrida de cavalos"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "automobilismo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "esqui"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "futebol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "natação"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "ping-pong"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tênis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Centro de Esportes"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Editar Centro de Esportes"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Mini-Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Editar Mini-Golf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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 "tipo"
 
 #. item "Sport/Multi" combo "type"
@@ -19557,203 +19890,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "estádio"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr ""
@@ -19761,56 +20094,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr ""
@@ -19818,182 +20151,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Editar Campo de Baseball"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Construções"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr ""
@@ -20001,5 +20334,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Prédio Público"
@@ -20007,10 +20340,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Editar Prédio Público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Prefeitura"
@@ -20018,10 +20351,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Editar Prefeitura"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Embaixada"
@@ -20029,10 +20362,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Fórum"
@@ -20041,10 +20374,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Editar Fórum"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Presídio"
@@ -20053,10 +20386,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Editar Presídio"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polícia"
@@ -20066,10 +20399,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Editar Polícia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Bombeiros"
@@ -20078,10 +20411,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Editar Bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Correios"
@@ -20089,5 +20422,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Editar Correios"
@@ -20095,15 +20428,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Creche"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Editar Creche"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Escola"
@@ -20111,10 +20444,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Editar Escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universidade"
@@ -20122,10 +20455,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Editar Universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Faculdade"
@@ -20133,5 +20466,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Editar Faculdade"
@@ -20139,5 +20472,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cinema"
@@ -20146,10 +20479,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Editar Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Biblioteca"
@@ -20158,9 +20491,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Editar Biblioteca"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Centro de Artes"
@@ -20168,10 +20501,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Editar Centro de Artes"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teatro"
@@ -20180,10 +20513,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Editar Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Lugar de Adoração"
@@ -20193,5 +20526,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Editar Lugar de Adoração"
@@ -20200,6 +20533,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr ""
@@ -20208,66 +20541,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "budismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "cristianismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hinduísmo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "jainismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "judaísmo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "muçulmano"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikhismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "espiritismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoísmo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "unitarianismo"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastrianismo"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Denominação"
@@ -20276,81 +20609,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglicana"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "batista"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "católica"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangélica"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "testemunha de jeová"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "luterana"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mórmon"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbiteriana"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "xiismo"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunismo"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Endereços"
@@ -20359,5 +20692,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Editar Informações de Endereço"
@@ -20365,5 +20698,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Número da casa"
@@ -20371,20 +20704,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nome da casa"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Cidade"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "CEP"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Código do país"
@@ -20393,5 +20726,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Editar Interpolação de Endereços"
@@ -20399,61 +20732,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Esquema de numeração"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "números ímpares"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "números pares"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Editar Fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Editar Torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20461,25 +20794,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Torre de Água"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Editar Torre de Água"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasômetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Editar Gasômetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Farol"
@@ -20487,10 +20820,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Editar Farol"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Moinho de Vento"
@@ -20498,10 +20831,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Editar Moinho de Vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Cano"
@@ -20510,37 +20843,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Editar Cano"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "gás"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Estação de Tratamento de Esgoto"
@@ -20550,10 +20883,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Editar Estação de Tratamento de Esgoto"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Guindaste"
@@ -20561,10 +20894,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Editar Guindaste"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -20572,10 +20905,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Vértice Geodésico"
@@ -20583,10 +20916,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Editar Vértice Geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Câmera de Vigilância"
@@ -20594,5 +20927,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Editar Câmera de Vigilância"
@@ -20600,5 +20933,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Gerador de Energia"
@@ -20608,35 +20941,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Editar Gerador de Energia"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "eólica"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "hidrelétrica"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fóssil"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "carvão"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Estação de Energia"
@@ -20645,10 +20978,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Editar Estação de Energia"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Subestação de Energia"
@@ -20657,5 +20990,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Editar Subestação de Energia"
@@ -20663,10 +20996,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Torre de Energia"
@@ -20677,23 +21010,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Editar Torre de Energia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Linha de transmissão"
@@ -20702,75 +21035,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Editar Linha de Transmissão"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Voltagem"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Comodidades"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Banheiros"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Caixa de Correio"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefone"
@@ -20779,5 +21112,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Editar Telefone"
@@ -20785,5 +21118,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Moedas"
@@ -20791,5 +21124,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Notas"
@@ -20797,5 +21130,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20803,5 +21136,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr ""
@@ -20809,15 +21142,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Cartão de Crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Cartão Telefônico"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Reciclagem"
@@ -20826,5 +21159,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr ""
@@ -20832,35 +21165,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Baterias"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Ferro Velho"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Banco"
@@ -20869,31 +21202,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20964,40 +21297,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "grama"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -21006,30 +21338,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Chafariz"
@@ -21038,10 +21370,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Editar Chafariz"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Bebedouro"
@@ -21050,10 +21382,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Editar Bebedouro"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -21061,33 +21393,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Lojas"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Editar Supermercado"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Loja de Conveniência"
@@ -21095,9 +21427,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Editar Loja de Conveniência"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Quiosque"
@@ -21105,27 +21437,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Editar Quiosque"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr ""
@@ -21133,5 +21465,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Editar Máquina de Vendas"
@@ -21139,88 +21471,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Produtos à venda"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "tíquetes de transporte público"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "mapas de transporte público"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "tíquetes de estacionamento"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "comida"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "bebidas"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "doces"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "cigarros"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "ração animal"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "jornais"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "brinquedos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "selos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "Cartões SIM"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "preservativos"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "absorventes"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "sacos para fezes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "Cartões de fidelidade"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Açougue"
@@ -21228,9 +21560,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Editar Açougue"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Padaria"
@@ -21238,9 +21570,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Editar Padaria"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Floricultura"
@@ -21248,18 +21580,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Editar Floricultura"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Orgânicos"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Editar Loja de Orgânicos"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Álcool"
@@ -21267,54 +21599,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Editar Loja de Bebidas"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Computador"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Editar Loja de Computador"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Eletrônicos"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Editar Loja de Eletrônicos"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Equipamentos de Áudio"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Editar Loja de Equipamentos de Áudio"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Móveis"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Editar Loja de Móveis"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Loja de Plantas"
@@ -21322,9 +21654,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Editar Loja de Plantas"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21332,9 +21664,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Editar Loja de Utilidades Domésticas"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -21342,54 +21674,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Papelaria"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Editar Papelaria"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Cabelereiro"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Editar Cabelereiro"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Sapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Editar Loja de Sapatos"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Brinquedos"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Editar Loja de Brinquedos"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Locadora de Vídeo"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Editar Locadora de Vídeo"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Lavanderia à Seco"
@@ -21397,9 +21729,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Editar Lavanderia à Seco"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -21407,9 +21739,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Editar Lavanderia"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr ""
@@ -21417,28 +21749,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Editar Loja de Esportes"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Óculos"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Editar Loja de Óculos"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Dinheiro"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Banco"
@@ -21446,14 +21778,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Editar Banco"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Caixa Eletrônico"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Loja de Câmbio"
@@ -21461,5 +21793,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Editar Loja de Câmbio"
@@ -21467,15 +21799,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Editar Caixa Eletrônico"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Saúde"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Médicos"
@@ -21483,18 +21815,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Editar Médicos"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Dentistas"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Editar Dentistas"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Farmácia"
@@ -21502,5 +21834,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Editar Farmácia"
@@ -21508,9 +21840,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Hospital"
@@ -21518,10 +21850,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Editar Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Entrada de Emergência"
@@ -21530,5 +21862,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Editar Entrada de Emergência"
@@ -21537,20 +21869,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Número de telefone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use código internacional, como +12-345-67890)"
@@ -21558,5 +21890,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Veterinária"
@@ -21565,59 +21897,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Editar Veterinária"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Lugares"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Editar Continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Editar País"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Estado"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Editar Estado"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Região"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Editar Região"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Condado"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Editar Condado"
@@ -21625,15 +21962,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Cidade"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Editar Cidade (mais que 100 mil habitantes)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Cidade (menos que 100 mil habitantes)"
@@ -21641,10 +21978,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Editar Cidade (menos que 100 mil habitantes)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Bairro"
@@ -21652,25 +21989,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Editar Bairro"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Vilarejo"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Editar Vilarejo"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr ""
@@ -21678,5 +22015,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr ""
@@ -21684,10 +22021,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Ilha"
@@ -21695,10 +22032,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Editar Ilha"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21706,5 +22043,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21712,5 +22049,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Entrada de Caverna"
@@ -21718,10 +22055,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Editar Entrada de Caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Pico"
@@ -21729,10 +22066,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Editar Pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Geleira"
@@ -21740,10 +22077,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Editar Geleira"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Vulcão"
@@ -21751,70 +22088,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Editar Vulcão"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Fronteiras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Editar Fronteiras Nacionais"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Administrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Editar Fronteiras Administrativas"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Editar Fronteiras Civis"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Editar Fronteiras Políticas"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Parque nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Editar Fronteira de Parque Nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Uso da terra"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Árvore"
@@ -21823,15 +22160,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Editar Árvore"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Nome Botânico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Floresta"
@@ -21840,5 +22177,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Editar Floresta"
@@ -21846,17 +22183,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "decídua"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "misturado"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Floresta"
@@ -21865,14 +22202,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Reserva Natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Editar Reserva Natural"
@@ -21880,25 +22217,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Arbusto"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Editar arbusto"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr ""
@@ -21906,10 +22243,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Editar rocha"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Matagal"
@@ -21917,5 +22254,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Editar matagal"
@@ -21923,5 +22260,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr ""
@@ -21930,45 +22267,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -21976,25 +22313,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Jardim"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Editar Jardim"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -22002,10 +22339,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr ""
@@ -22013,20 +22350,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Editar Parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "área de recreação"
@@ -22034,5 +22371,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -22040,15 +22377,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Cemitério"
@@ -22056,9 +22393,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Editar Cemitério"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Cemitério"
@@ -22066,39 +22403,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr ""
@@ -22106,15 +22443,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr ""
@@ -22122,55 +22459,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Área de construção"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Pedreira"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -22180,5 +22517,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -22187,10 +22524,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "segmento externo"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "segmento interno"
@@ -22198,5 +22535,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Restrição de manobra"
@@ -22205,5 +22542,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Editar restrição de manobras"
@@ -22211,34 +22548,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Restrição"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "proibida_conversão_esquerda"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "proibida_conversão_direita"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "proibido_em_frente"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "proibido_retornar"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "somente_a_direita"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "somente_a_esuqerda"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "somente_em_frente"
@@ -22247,15 +22584,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "do caminho"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "nó de via ou caminho"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "para caminho"
@@ -22263,5 +22600,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22270,5 +22607,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22276,5 +22613,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Tipo de rota"
@@ -22346,5 +22683,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22353,17 +22690,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "ônibus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "estrada"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "Ferry"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "Esqui"
@@ -22416,5 +22753,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22423,13 +22760,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "caminhada"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "bonde/VLT"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "desvio"
@@ -22443,10 +22780,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "Metrô"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Descrição de símbolo"
@@ -22454,31 +22791,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "alternativa"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "temporário"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Cor (hex)"
@@ -22487,30 +22824,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "segmento de rota"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "segmento em frente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "Ponto de parada"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "ponto de parada em frente"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "ponto de parada atrás"
@@ -22948,11 +23285,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "depreciado"
@@ -24976,5 +25313,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25646,4 +25983,12 @@
 #.
 #. <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"/>
@@ -25668,5 +26013,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "histórico"
@@ -25680,5 +26025,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr ""
@@ -25692,5 +26037,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "aterro"
@@ -25712,5 +26057,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr ""
@@ -25724,5 +26069,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "floresta"
@@ -25736,5 +26081,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "fazenda"
@@ -25757,5 +26102,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "venda"
@@ -25769,5 +26114,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "industrial"
@@ -25781,5 +26126,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "Área contaminada"
@@ -25793,5 +26138,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "campo"
@@ -25805,5 +26150,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25860,7 +26205,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "exército"
@@ -25874,5 +26219,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "Cemitério"
@@ -25885,5 +26230,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "cume"
@@ -25898,5 +26243,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "geleira"
@@ -25910,5 +26255,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "vulcão"
@@ -25963,8 +26308,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr ""
@@ -25978,5 +26323,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "arbusto"
@@ -25990,5 +26335,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr ""
@@ -26002,8 +26347,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "madeira"
+msgstr ""
 
 #. color water
@@ -26015,5 +26359,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "lama"
@@ -26027,5 +26371,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "praia"
@@ -26103,8 +26447,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "rota"
@@ -26152,7 +26496,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "limite"
@@ -26302,11 +26646,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "lugar"
@@ -26354,6 +26698,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "endereço"
@@ -26661,32 +27005,69 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Erro ao carregar página {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgid "File could not be found."
+#~ msgstr "Arquivo não pode ser encontrado."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Por favor selecione no mínimo uma tarefa para baixar"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Envio para API OSM falhou"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Relação conflitando"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "Faltando página de Ajuda. Crie uma em <A HREF=\"{0}\">português</A>."
+#~ "<html>A selecção \"{0}\" é usada pela relação \"{1}\" com o papel {2}."
+#~ "<br>Apagar da relação?</html>"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
 #~ msgstr ""
-#~ "Página de ajuda. Crie-a em <A HREF=\"{0}\">English</A> ou <A HREF=\"{1}"
-#~ "\">português</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Pode-se editar somente páginas de ajuda online do JOSM"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Usar preferencia ''{0}''"
+#~ "<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da relação?"
+#~ "</html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Erro enquanto analisando"
+
+#~ msgid "File not found"
+#~ msgstr "Arquivo não encontrado"
+
+#~ msgid "Replace"
+#~ msgstr "Substituir"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Por favor, entre com as coordenadas desejadas primeiro."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Selecione um favorito primeiro"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Por favor, entre com texto de busca"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Não foi possível ler resultados de busca de place do servidor"
+
+#~ msgid "name"
+#~ msgstr "nome"
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Copiar padrões"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Você pode alterar o número de dias depois que este irá "
+#~ "aparecer<br>definindo a opção de configuração 'pluginmanager.warntime'.)"
 
 #~ msgid "Unknown version"
 #~ msgstr "Versão desconhecida"
-
-#~ msgid "Aborting..."
-#~ msgstr "Interrompendo..."
 
 #~ msgid "Unsaved Changes"
@@ -26754,4 +27135,10 @@
 #~ msgstr "EPSG:4326"
 
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Usar preferencia ''{0}''"
+
 #~ msgid "Tags (empty value deletes tag)"
 #~ msgstr "Etiquetas (um valor nulo excluir etiqueda)"
@@ -26802,7 +27189,4 @@
 #~ msgstr "Unir camada diretamente inferior com camada selecionada."
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "Atualizar lista de seleção"
-
 #~ msgid "Conflicts: {0}"
 #~ msgstr "Conflitos: {0}"
@@ -26825,4 +27209,10 @@
 #~ msgid "JOSM Online Help"
 #~ msgstr "Ajuda Online do JOSM"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Pode-se editar somente páginas de ajuda online do JOSM"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Erro ao carregar página {0}"
 
 #~ msgid "History of Element"
@@ -26912,7 +27302,4 @@
 #~ msgid "Update failed"
 #~ msgstr "Atualização falhou"
-
-#~ msgid "Updates the currently selected primitives from the server"
-#~ msgstr "Atualiza as primitivas selecionadas a partir do servidor"
 
 #~ msgid "Conflict detected"
@@ -27056,9 +27443,4 @@
 #~ msgstr "Continuar assim mesmo"
 
-#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-#~ msgstr ""
-#~ "<html> Falha ao carregar histórico a partir do servidor. Detalhes: <br> "
-#~ "{0} </ html>"
-
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Apagar membro de relação {0}{1}"
@@ -27114,4 +27496,15 @@
 #~ msgstr "Baixando referencias..."
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Faltando página de Ajuda. Crie uma em <A HREF=\"{0}\">português</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Página de ajuda. Crie-a em <A HREF=\"{0}\">English</A> ou <A HREF=\"{1}"
+#~ "\">português</A>."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valor não esperado de retorno. Veio {0}"
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 18273)
+++ applications/editors/josm/i18n/po/ro.po	(revision 18508)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-17 14:53+0000\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-25 13:41+0000\n"
 "Last-Translator: Manuel R. Ciosici <manuelciosici@yahoo.com>\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: 2009-10-25 12:05+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -23,64 +23,64 @@
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Se creează interfața grafică"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "_Ajutor"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Se ignoră URL-ul prost format: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -93,12 +93,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -108,27 +102,26 @@
 msgstr "Avertisment"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Se ingoră fişierul URL prost format: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -136,23 +129,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -160,5 +154,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -167,21 +161,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -190,5 +185,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -201,17 +196,9 @@
 msgstr "Eroare"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "NECUNOSCUT"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Despre"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Afişează ecranul cu informaţii despre program."
@@ -219,37 +206,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Editor Java OpenStreetMap"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Versiune {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Ultima modificare la {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Versiunea Java {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Pagina pricipală"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Rapoarte erori"
@@ -259,5 +246,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -265,33 +252,29 @@
 msgstr "Informaţii"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Citeşte-mă"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revizia"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Contribuţii"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Module"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Despre JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Fişierul nu a putut fi găsit."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -322,42 +305,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -365,5 +347,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -378,19 +360,19 @@
 "încărcate."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -399,50 +381,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Adaugă Nod..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Adaugă un nod prin introducerea latitudinii şi longitudinii"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Editează: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Introdu coordonatele pentru noul nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Foloseşte grade zecimale"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Valorile negative denotă emisfera Vestică/Sudică"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -451,5 +433,5 @@
 msgstr "Latitudine"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -458,27 +440,27 @@
 msgstr "Longitudine"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Aliniază Nodurile în Cerc"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Mută nodurile selectate într-un cerc."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -488,5 +470,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -502,30 +484,28 @@
 msgstr "Unealtă: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Vă rog selectaţi cel puţin patru noduri."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -535,84 +515,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Aliniază Nodurile în Linie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Mută nodurile selectate într-o linie."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Te rog selectează cel puţin trei noduri."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "date"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "strat"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "selecţie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "conflict"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "descărcare"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Apropie la {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Apropie vederea la {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Vedere: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -620,37 +600,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Combină calea"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Combină mai multe căi într-una."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Schimbă direcţiile?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Inversează şi Combină"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -660,5 +640,5 @@
 "din ele?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -666,41 +646,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Combină {0} căi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Selectează te rog cel puţin două căi pentru a le combina."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+msgid "Copy"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-msgid "Copy"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
 msgid "Copy selected objects to paste buffer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -708,16 +688,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -729,5 +707,5 @@
 msgstr "Şterge"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr ""
@@ -735,6 +713,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -748,73 +726,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../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:30
+#: ../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:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Descarc datele OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Descarcă hărţi de la serverul OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -823,39 +778,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+msgid "Duplicate"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
-msgid "Duplicate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 msgid "Duplicate selection by copy and immediate paste."
 msgstr ""
@@ -865,41 +820,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Ieşire"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Părăsiţi aplicaţia."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exportă datele într-un fişier GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nimic de exportat. Obţineţi mai întâi nişte date."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -938,6 +893,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -956,9 +911,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -978,5 +933,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -984,36 +939,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../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:29
+#: ../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:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr ""
@@ -1023,168 +978,186 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Anulez..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../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:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../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:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
+#: ../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 ""
+
 #: ../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
-#, java-format
-msgid "Move objects {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
-msgid "down"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
-msgid "left"
-msgstr ""
-
-#. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
 msgid "right"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Nu pot muta obiecte în afara lumii."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Deschide un fişier."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Descarc date"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr ""
@@ -1194,18 +1167,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1214,9 +1187,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1225,36 +1198,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
+#: ../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 "Paste Tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1263,5 +1237,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1270,59 +1244,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Preferinţe..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Deschide o pagină de preferinţe pentru opţiunile globale"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Preferinţe"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Refă"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Refă ultima acţiune anulată."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Redenumire strat"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Şi redenumeşte şi fişierul"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1330,10 +1304,10 @@
 msgstr "Salvează"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Salvează datele curente."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1384,21 +1358,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Salvează datele curente într-un fişier nou."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1406,28 +1380,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
+msgid "Show Status Report"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-msgid "Show Status Report"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1436,18 +1410,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1455,5 +1429,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1465,9 +1439,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1475,10 +1449,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1503,70 +1477,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Trasează linii între puncte gps neprelucrate"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 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:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 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:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 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:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1576,9 +1550,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1586,80 +1560,80 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Anulează"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Anulează ultima acţiune."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+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:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr ""
@@ -1671,8 +1645,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1681,5 +1655,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1687,29 +1661,29 @@
 msgstr "Nu sunt schimbări de transmis."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Nimic de transmis. Mai întâi obţineţi nişte date."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1723,11 +1697,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1738,5 +1712,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1746,22 +1720,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1772,28 +1746,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1802,17 +1767,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Schimb {0} obiect"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1831,11 +1810,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Apropie"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Apropie"
@@ -1915,21 +1894,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Descarc date GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Date GPS neprelucrate"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Descarc date"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1937,27 +1912,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Date OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Numele utilizatorului."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1969,7 +1955,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Eroare la prelucrare."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1991,5 +1992,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2017,38 +2018,38 @@
 msgstr "selectat"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2057,14 +2058,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr ""
@@ -2084,5 +2085,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2093,5 +2094,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr ""
@@ -2151,10 +2152,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2164,4 +2165,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Apropie"
@@ -2179,5 +2181,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr ""
@@ -2276,42 +2277,48 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2321,51 +2328,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Căutare"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr ""
@@ -2393,26 +2400,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2421,5 +2439,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2514,4 +2532,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2529,8 +2563,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Schimb {0} obiect"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2612,5 +2646,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2646,4 +2680,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2674,29 +2719,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr ""
@@ -2704,6 +2726,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2712,5 +2734,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2894,15 +2916,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, java-format
+msgid "Illegal double value ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2911,5 +2948,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2918,5 +2955,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2925,5 +2962,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2932,5 +2969,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2938,5 +2975,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2945,5 +2982,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2952,5 +2989,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2959,5 +2996,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2966,19 +3003,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -2987,5 +3047,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "NECUNOSCUT"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3007,20 +3087,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr ""
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr ""
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr ""
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr ""
@@ -3031,4 +3111,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3096,14 +3190,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3111,5 +3205,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3136,6 +3230,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3195,113 +3289,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
+#, java-format
+msgid "Deleted member ''{0}'' in relation."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
-#, java-format
-msgid "Deleted member ''{0}'' in relation."
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#, java-format
+msgid "Way ''{0}'' with less than two points."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+msgid "More than one \"from\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
-#, java-format
-msgid "Way ''{0}'' with less than two points."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
-msgid "More than one \"from\" way found."
+msgid "More than one \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+msgid "More than one \"via\" found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-msgid "More than one \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
-msgid "More than one \"via\" found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3322,5 +3416,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3336,5 +3430,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3346,5 +3439,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3374,5 +3466,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "fundal"
@@ -3440,10 +3532,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3472,5 +3564,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr ""
@@ -3487,4 +3579,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3500,33 +3594,33 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3534,16 +3628,16 @@
 msgstr "Conflict"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Gazdă necunoscută"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3555,4 +3649,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+msgid "Click to close the dialog"
 msgstr ""
 
@@ -3617,74 +3715,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Nume utilizator"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Parolă"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "utilizare"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "opţiuni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Arată acest ajutor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Argument geometrie unix standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Descarcă perimetrul selectat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Descarcă perimetrul selectat ca date gps neprelucrate"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Selectează cu căutarea dată"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Restabileşte preferinţele implicite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3693,9 +3791,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "exemple"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3706,25 +3804,25 @@
 "că aţi încărcat date înainte de --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "În loc de --download=<bbox> puteţi specifica osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3737,11 +3835,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3766,6 +3864,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3866,24 +3964,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "stratul nu este în listă."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Eroare la prelucrare"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+msgid "Click to cancel the current operation"
 msgstr ""
 
@@ -3905,5 +3999,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3932,20 +4026,17 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Schimb {0} obiect"
-msgstr[1] "Schimb {0} obiecte"
-msgstr[2] "Schimb {0} de obiecte"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Şterge"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "şters"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
@@ -3961,5 +4052,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4008,5 +4099,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4023,5 +4114,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4221,8 +4312,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4529,6 +4620,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4542,6 +4633,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4599,36 +4690,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4640,5 +4731,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr ""
@@ -4728,4 +4819,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4736,4 +4829,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4747,49 +4841,82 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Introdu valori pentru toate conflictele."
+
+#: ../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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4826,6 +4953,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4916,10 +5043,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -4986,5 +5110,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5029,4 +5154,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5052,6 +5178,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5060,22 +5186,22 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<diferit>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Schimb valorile?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5084,70 +5210,74 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Vă rog selectaţi o cheie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Vă rog selectaţi o valoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 "Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr ""
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Şterge cheia selectată din toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr ""
@@ -5155,39 +5285,57 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Afişează istoricul tuturor elementelor selectate."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Selectaţi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+msgid "Download all members of the selected relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+msgid "Download members"
 msgstr ""
 
@@ -5215,5 +5363,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5225,14 +5373,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 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:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -5314,5 +5462,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5342,23 +5491,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5367,14 +5516,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5384,9 +5533,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5396,15 +5545,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5412,5 +5561,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5418,20 +5567,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5440,66 +5589,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr ""
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr ""
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5508,9 +5657,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5519,41 +5668,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5563,17 +5712,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5584,13 +5733,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5604,14 +5753,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5661,57 +5810,84 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Semne de carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Vă rog întâi introduceţi coordonatele dorite."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+msgid "Create bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+msgid "Add a bookmark for the currently selected download area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Vă rog introduceţi un nume pentru locaţie."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Selectaţi întâi un semn de carte."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+msgid "Remove the currently selected bookmarks"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+msgid "Rename the currently selected bookmark"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5719,356 +5895,131 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Date OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+msgid "Select to download OSM data in the selected download area."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Date GPS neprelucrate"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+msgid "Select to download GPS traces in the selected download area."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Şterge stratul selectat."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+msgid "Click do download the currently selected area"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Vă rog selectaţi rândul care va fi editat."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+msgid "Enter a place name to search for"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr ""
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr ""
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr ""
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "la"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Căutare"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+msgid "Click to start searching for places"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6426,4 +6377,6 @@
 #. 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" />
@@ -6804,6 +6757,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6869,11 +6823,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6883,6 +6837,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6892,79 +6846,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Nume"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "Căutare"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "la"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7045,4 +7266,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7334,9 +7556,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Obiecte de modificat:"
+msgstr[1] "Obiecte de modificat:"
+msgstr[2] "Obiecte de modificat:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7432,5 +7655,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7460,59 +7692,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Imagini pentru {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Nu există timp pentru punctul {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Nu pot citi timpul \"{0}\" din punctul {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Citesc {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Nu am găsit imagini cu mărci de timp citibile."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Citesc {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Imagini geoetichetate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Start GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Sfârşit GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "diferentă curentă: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "diferenţă zonă de timp: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7521,51 +7753,51 @@
 msgstr[2] "de imagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} în urmă."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Sincronizare ceas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Imagine JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Datele din fişierul \"{0}\" nu au putut fi interpretate."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Nu există timp EXIF în fişierul \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Imagine"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Sincronizare timp cu unitatea GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Timpul introdus nu a putut fi interpretat."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7573,30 +7805,30 @@
 msgstr "punct gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Personalizează trasarea liniilor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Utilizează opţiunile globale."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Trasează linii între puncte pentru acest strat."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Nu trasa linii între puncte pentru acest strat."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Selectaţi opţiunile pentru trasarea liniilor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7604,5 +7836,5 @@
 msgstr "Personalizează culoarea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7611,5 +7843,5 @@
 msgstr "Implicit"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7618,43 +7850,43 @@
 msgstr "Alegeţi o culoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importă imagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7664,28 +7896,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7694,5 +7926,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7701,10 +7933,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Converteşte la strat de date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7712,11 +7944,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7726,29 +7958,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7757,13 +7989,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7771,5 +7999,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7777,23 +8005,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7802,39 +8030,58 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} şters.)"
+msgstr[1] " ({0} şters.)"
+msgstr[2] " ({0} şters.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} constă în:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} şters.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8001,6 +8248,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8015,6 +8260,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8184,5 +8427,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8510,20 +8753,19 @@
 msgstr "Limbă"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8538,6 +8780,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr ""
@@ -8690,68 +8931,101 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
 msgstr "Şterge sursele selectate din listă."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Editează valoarea cheii selectata pentru toate obiectele"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+msgid "Add a new icon path"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Reîncarcă lista de selecţii"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Şterge cheia selectată din toate obiectele"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8931,5 +9205,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr ""
@@ -9004,7 +9278,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9012,5 +9286,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9117,5 +9391,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -9341,5 +9615,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9366,5 +9640,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9372,5 +9646,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9383,5 +9657,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9392,33 +9666,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Parolă sau nume utilizator incorecte."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Atenţie: Parola este transferată necriptată."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Salvează nume utilizator şi parolă (necriptate)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Introduceţi parola"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9427,17 +9701,17 @@
 "nici o parolă."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Adresă server principal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "Parola OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9534,5 +9808,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9541,38 +9815,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9580,19 +9854,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Obiect ilegal cu id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9601,7 +9875,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9611,25 +9889,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9637,5 +9915,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9644,5 +9922,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9650,5 +9928,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9657,13 +9935,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9674,14 +9952,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Descarc datele OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9792,15 +10069,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9810,29 +10087,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] ""
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9844,10 +10126,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9857,47 +10139,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Update plugins"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Modulul nu a fost găsit: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9905,9 +10197,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9915,19 +10207,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9935,22 +10227,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9959,18 +10251,18 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -9980,9 +10272,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -9994,9 +10286,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10018,19 +10310,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "necunoscut"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10088,5 +10380,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10095,5 +10387,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10102,5 +10394,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10110,5 +10402,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10118,10 +10410,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10130,5 +10422,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10137,16 +10429,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10156,5 +10448,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10163,5 +10455,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10170,5 +10462,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10177,10 +10469,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10189,10 +10481,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10203,5 +10495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10211,5 +10503,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10220,5 +10512,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10313,11 +10605,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10460,5 +10745,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -10474,10 +10760,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10485,103 +10771,103 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10631,46 +10917,47 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
+msgstr "Mută stratul selectat un rând în sus."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -10922,5 +11209,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -10933,10 +11220,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -10984,13 +11271,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -10999,13 +11286,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11130,5 +11417,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11169,13 +11456,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11306,22 +11593,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11329,5 +11616,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11341,9 +11628,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11366,5 +11653,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11386,5 +11673,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr ""
@@ -11413,5 +11700,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11420,18 +11707,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11526,5 +11813,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr ""
@@ -11930,7 +12217,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr ""
@@ -12131,32 +12418,32 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
+msgid "Capture GPS Track"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
+msgid "Center Once"
+msgstr ""
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+msgid "Center the LiveGPS layer to current position."
+msgstr ""
+
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
-msgid "Capture GPS Track"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
-msgid "Connect to gpsd server and show current position in LiveGPS layer."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
-msgid "Center Once"
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
-msgid "Center the LiveGPS layer to current position."
-msgstr ""
-
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Auto-Center"
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr ""
@@ -12245,24 +12532,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12406,4 +12693,9 @@
 msgstr ""
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Strat"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12449,30 +12741,30 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
+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:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
+msgid "Confirm Remote Control action"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-msgid "Do you want to allow this?"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-msgid "Confirm Remote Control action"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-msgid "Remote Control has been asked to create a new node."
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12491,7 +12783,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12500,4 +12790,5 @@
 #: ../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 ""
@@ -12519,25 +12810,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12567,92 +12858,84 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Apropie"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+msgid "Show Tile Info"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+msgid "Min zoom lvl: "
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
 msgstr ""
 
@@ -12666,5 +12949,5 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12826,5 +13109,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr ""
@@ -12868,29 +13151,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -12898,33 +13181,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Introdu valori pentru toate conflictele."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Rezolvă Conflictele"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13129,8 +13412,4 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr ""
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13175,23 +13454,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
-msgid "Unconnected coastline"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
+msgid "Unconnceted coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "Inversează şi Combină"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13214,18 +13492,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13466,4 +13744,8 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Şterge sursele selectate din listă."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13678,7 +13960,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr ""
@@ -13692,5 +13974,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr ""
@@ -13700,25 +13982,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr ""
@@ -13810,21 +14092,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14057,9 +14344,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr ""
@@ -14505,6 +14792,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr ""
@@ -15066,5 +15353,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15076,5 +15363,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr ""
@@ -15362,7 +15649,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr ""
@@ -15511,8 +15798,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr ""
@@ -15639,31 +15926,4 @@
 msgstr ""
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr ""
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15784,5 +16044,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr ""
@@ -15817,5 +16077,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr ""
@@ -15850,5 +16110,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr ""
@@ -16238,12 +16498,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr ""
@@ -16456,6 +16716,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr ""
@@ -16882,5 +17142,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr ""
@@ -17413,25 +17673,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr ""
@@ -17497,24 +17757,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17527,24 +17787,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17557,24 +17817,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17607,6 +17867,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr ""
@@ -17622,5 +17882,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
@@ -17634,5 +17894,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr ""
@@ -17868,5 +18128,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr ""
@@ -18334,5 +18594,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr ""
@@ -18347,5 +18607,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr ""
@@ -18499,16 +18759,27 @@
 
 #. 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:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr ""
@@ -18516,55 +18787,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr ""
@@ -18572,35 +18843,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr ""
@@ -18614,6 +18885,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr ""
@@ -19005,30 +19276,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr ""
@@ -19038,226 +19309,279 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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 ""
 
@@ -19295,203 +19619,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr ""
@@ -19499,56 +19823,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr ""
@@ -19556,182 +19880,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr ""
@@ -19739,5 +20063,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr ""
@@ -19745,10 +20069,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr ""
@@ -19756,10 +20080,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr ""
@@ -19767,10 +20091,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr ""
@@ -19779,10 +20103,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr ""
@@ -19791,10 +20115,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr ""
@@ -19804,10 +20128,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr ""
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr ""
@@ -19816,10 +20140,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr ""
@@ -19827,5 +20151,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr ""
@@ -19833,15 +20157,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr ""
@@ -19849,10 +20173,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr ""
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr ""
@@ -19860,10 +20184,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr ""
@@ -19871,5 +20195,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr ""
@@ -19877,5 +20201,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr ""
@@ -19884,10 +20208,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr ""
@@ -19896,9 +20220,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr ""
@@ -19906,10 +20230,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr ""
@@ -19918,10 +20242,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr ""
@@ -19931,5 +20255,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr ""
@@ -19938,6 +20262,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr ""
@@ -19946,66 +20270,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr ""
@@ -20014,81 +20338,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr ""
@@ -20097,5 +20421,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr ""
@@ -20103,5 +20427,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr ""
@@ -20109,20 +20433,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr ""
@@ -20131,5 +20455,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -20137,61 +20461,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr ""
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20199,25 +20523,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr ""
@@ -20225,10 +20549,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr ""
@@ -20236,10 +20560,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr ""
@@ -20248,37 +20572,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr ""
@@ -20288,10 +20612,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr ""
@@ -20299,10 +20623,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -20310,10 +20634,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -20321,10 +20645,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr ""
@@ -20332,5 +20656,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -20338,5 +20662,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr ""
@@ -20346,35 +20670,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr ""
@@ -20383,10 +20707,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr ""
@@ -20395,5 +20719,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -20401,10 +20725,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr ""
@@ -20415,23 +20739,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr ""
@@ -20440,75 +20764,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr ""
@@ -20517,5 +20841,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr ""
@@ -20523,5 +20847,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr ""
@@ -20529,5 +20853,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr ""
@@ -20535,5 +20859,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20541,5 +20865,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr ""
@@ -20547,15 +20871,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr ""
@@ -20564,5 +20888,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr ""
@@ -20570,35 +20894,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr ""
@@ -20607,31 +20931,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20702,39 +21026,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -20743,30 +21067,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr ""
@@ -20775,10 +21099,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr ""
@@ -20787,10 +21111,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -20798,33 +21122,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr ""
@@ -20832,9 +21156,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr ""
@@ -20842,27 +21166,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr ""
@@ -20870,5 +21194,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr ""
@@ -20876,88 +21200,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr ""
@@ -20965,9 +21289,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr ""
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr ""
@@ -20975,9 +21299,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr ""
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr ""
@@ -20985,18 +21309,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21004,54 +21328,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr ""
@@ -21059,9 +21383,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21069,9 +21393,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -21079,54 +21403,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr ""
@@ -21134,9 +21458,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr ""
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr ""
@@ -21144,9 +21468,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr ""
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr ""
@@ -21154,28 +21478,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr ""
@@ -21183,14 +21507,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr ""
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr ""
@@ -21198,5 +21522,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr ""
@@ -21204,15 +21528,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr ""
@@ -21220,18 +21544,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr ""
@@ -21239,5 +21563,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr ""
@@ -21245,9 +21569,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr ""
@@ -21255,10 +21579,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr ""
@@ -21267,5 +21591,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -21274,20 +21598,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -21295,5 +21619,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr ""
@@ -21302,59 +21626,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr ""
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr ""
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr ""
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr ""
@@ -21362,15 +21691,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr ""
@@ -21378,10 +21707,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr ""
@@ -21389,25 +21718,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr ""
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr ""
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr ""
@@ -21415,5 +21744,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr ""
@@ -21421,10 +21750,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr ""
@@ -21432,10 +21761,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr ""
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21443,5 +21772,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21449,5 +21778,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr ""
@@ -21455,10 +21784,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr ""
@@ -21466,10 +21795,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr ""
@@ -21477,10 +21806,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr ""
@@ -21488,70 +21817,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr ""
@@ -21560,15 +21889,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr ""
@@ -21577,5 +21906,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr ""
@@ -21583,17 +21912,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr ""
@@ -21602,14 +21931,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -21617,25 +21946,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr ""
@@ -21643,10 +21972,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr ""
@@ -21654,5 +21983,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr ""
@@ -21660,5 +21989,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr ""
@@ -21667,45 +21996,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -21713,25 +22042,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21739,10 +22068,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr ""
@@ -21750,20 +22079,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr ""
@@ -21771,5 +22100,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -21777,15 +22106,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr ""
@@ -21793,9 +22122,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr ""
@@ -21803,39 +22132,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr ""
@@ -21843,15 +22172,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr ""
@@ -21859,55 +22188,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr ""
@@ -21917,5 +22246,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr ""
@@ -21924,10 +22253,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr ""
@@ -21935,5 +22264,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr ""
@@ -21942,5 +22271,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -21948,34 +22277,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr ""
@@ -21984,15 +22313,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr ""
@@ -22000,5 +22329,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22007,5 +22336,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22013,5 +22342,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22083,5 +22412,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22090,17 +22419,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22153,5 +22482,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22160,13 +22489,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr ""
@@ -22180,10 +22509,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr ""
@@ -22191,31 +22520,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr ""
@@ -22224,30 +22553,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22685,11 +23014,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr ""
@@ -24713,5 +25042,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25383,4 +25712,12 @@
 #.
 #. <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"/>
@@ -25405,5 +25742,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr ""
@@ -25417,5 +25754,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr ""
@@ -25429,5 +25766,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr ""
@@ -25449,5 +25786,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr ""
@@ -25461,5 +25798,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr ""
@@ -25473,5 +25810,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr ""
@@ -25494,5 +25831,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr ""
@@ -25506,5 +25843,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr ""
@@ -25518,5 +25855,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25530,5 +25867,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25542,5 +25879,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25597,7 +25934,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr ""
@@ -25611,5 +25948,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr ""
@@ -25622,5 +25959,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr ""
@@ -25635,5 +25972,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr ""
@@ -25647,5 +25984,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr ""
@@ -25700,8 +26037,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr ""
@@ -25715,5 +26052,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr ""
@@ -25727,5 +26064,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr ""
@@ -25739,5 +26076,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3383
 msgid "woodarea"
 msgstr ""
@@ -25751,5 +26088,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr ""
@@ -25763,5 +26100,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr ""
@@ -25839,8 +26176,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr ""
@@ -25888,7 +26225,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr ""
@@ -26038,11 +26375,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr ""
@@ -26090,6 +26427,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr ""
@@ -26397,9 +26734,15 @@
 msgstr ""
 
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Se pot edita doar paginile din ajutorul JOSM online"
-
-#~ msgid "Aborting..."
-#~ msgstr "Anulez..."
+#~ msgid "File could not be found."
+#~ msgstr "Fişierul nu a putut fi găsit."
+
+#~ msgid "Error while parsing"
+#~ msgstr "Eroare la prelucrare"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Vă rog întâi introduceţi coordonatele dorite."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Selectaţi întâi un semn de carte."
 
 #~ msgid "Unknown version"
@@ -26425,7 +26768,4 @@
 #~ "în lista de istoric."
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "Reîncarcă lista de selecţii"
-
 #~ msgid "Merging conflicts."
 #~ msgstr "Îmbin conflictele."
@@ -26484,4 +26824,7 @@
 #~ msgstr[2] "{0} de obiecte au conflicte:"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Se pot edita doar paginile din ajutorul JOSM online"
+
 #~ msgid "Upload to OSM..."
 #~ msgstr "Despre JOSM..."
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 18273)
+++ applications/editors/josm/i18n/po/ru.po	(revision 18508)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-19 03:57+0000\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-26 21:02+0000\n"
 "Last-Translator: Calibrator <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
@@ -17,69 +17,69 @@
 "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: 2009-10-25 12:07+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
 "X-Poedit-Language: Russian\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Создание интерфейса"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Справка"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Игнорируется неверная ссылка: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -92,12 +92,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -107,27 +101,26 @@
 msgstr "Предупреждение"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнорирование неправильной ссылки на файл: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Не удалось прочитать файл ''{0}''.<br> Ошибка: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -135,23 +128,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -159,5 +153,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -166,21 +160,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -189,5 +184,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -200,17 +195,9 @@
 msgstr "Ошибка"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "НЕИЗВЕСТНО"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "О программе"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Отобразить информацию о программе."
@@ -218,37 +205,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Редактор OpenStreetMap на Java"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../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:141
+#: ../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:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Отчёты об ошибках"
@@ -258,5 +245,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -264,33 +251,29 @@
 msgstr "Сведения"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Для прочтения"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Редакция"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Авторы"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Лицензия"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Модули"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "О программе"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Файл не найден"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -328,42 +311,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -371,5 +353,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -384,19 +366,19 @@
 "линию или отношение."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Пожалуйста выберите целевой слой."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Выбор слоя"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Объединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -407,50 +389,50 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Не выбран слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Добавить точку..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Добавить точку, указав её широту и долготу"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Править: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Введите координаты новой точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Использовать десятичные градусы"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Отрицательные значения обозначают западное/южное полушарие"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -459,5 +441,5 @@
 msgstr "Широта"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -466,27 +448,27 @@
 msgstr "Долгота"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../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:36
+#: ../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:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -496,5 +478,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -510,30 +492,28 @@
 msgstr "Инструмент: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../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:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -543,85 +523,85 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../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:32
+#: ../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:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "данные"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "выделение"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "конфликт"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "скачанное"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Показать {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Изменить масштаб чтобы показать {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Вид: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Ничего не выделено для показа."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Нет конфликтов чтобы их показать."
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Закрыть открытые пакеты правок"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Закрывает открытые пакеты правок"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -629,37 +609,37 @@
 msgstr "Файл: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Пакеты правок не открыты"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Нет открытых пакетов правок"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Скачиваение открытых пакетов правок ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../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:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Объединить несколько линий в одну."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Изменить направления?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Перевернуть и объеденить"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -669,5 +649,5 @@
 "некоторых линий?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -677,41 +657,41 @@
 "последовательностью точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Объединить {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Выделите не менее двух линий для объединения."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Копировать"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Копировать выделенные объекты в буфер обмена."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Создать окружность"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Создать окружность по трём выделенным точкам"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Эти точки не в круге. Операция прервана."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -720,16 +700,14 @@
 "Выберите две или три точки или же одну линию с двумя или тремя точками."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -741,5 +719,5 @@
 msgstr "Удалить"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Удалить выделенные объекты."
@@ -747,6 +725,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -760,73 +738,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../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:30
+#: ../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:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Скачать с OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Скачать картографические данные с сервера OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Скачать"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Выберите хотя бы один тип данных для скачивания."
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr "Скачать родительские линии/отношения..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Скачать элементы, ссылающиеся на один из выделенных элементов"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr "Требуется id > 0, получено {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, fuzzy, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "обнаружено id > 0. Получено {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -835,39 +790,39 @@
 msgstr "Параметр ''{0}'' не должен быть пустым"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "За время импорта произошло {0} конфликт(ов)"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Конфликт во время скачивания"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Загрузка родителей элемента {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr "({0}/{1}) Загрузка родителей точки {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Загрузка родителей элемента {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr "({0}/{1}) Загрузка родителей линии {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Загрузка родителей элемента {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr "({0}/{1}) Загрузка родителей отношения {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Дублировать"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Создать копию выделения копированием и вставкой."
@@ -877,41 +832,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Выйти из программы"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Все форматы"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Экспорт в GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Экспортировать данные в GPX файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Нет данных для экспорта. Создайте данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -950,6 +905,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -968,9 +923,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -990,5 +945,5 @@
 msgstr "параметр ''{0}'' не должен быть null"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -996,36 +951,36 @@
 msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Экспорт GPX-файла"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../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:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../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:16
+#: ../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/JoinNodeWayAction.java:29
 #: ../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:29
+#: ../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:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Включить точку в линию"
@@ -1035,170 +990,188 @@
 msgstr "Нет ярлыка"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Соединить слои"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Объединить точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Объединить точки в одну (более старую)"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Пожалуйста, выберите как минимум две точки для объединения."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Прерывание..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Не удаётся объединить точки: пришлось бы удалить линию, которая еще "
 "используется."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Объединить {0} точек"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../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:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../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:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Отзеркалить выделенные точки и линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "вверх"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Переместить объекты {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "вниз"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "влево"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "вправо"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Переместить {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Перемещает объекты {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Невозможно переместить объекты за пределы мира."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Создать"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Создать новую карту."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Открыть..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Открыть файл."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Открытие файлов"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Открытие файла ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Открыть ссылку."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "На отдельный слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr "Вы делите данные, которые должны быть скачаны в новый слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Введите URL для скачивания:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../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:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Каталог для скачивания"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Скачать URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr "Начать скачивание данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "Закрыть диалог и отменить скачивание"
 
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Скачать данные"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Сделать углы прямыми"
@@ -1210,18 +1183,18 @@
 "градусов"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 msgid "Orthogonalize Shape / Undo"
 msgstr "Ортогонализировать форму / Отменить"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
 msgid "Undo orthogonalization for certain nodes"
 msgstr "Отменить ортогонализирование для определённых точек"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr "Ортогонализировать / Отменить"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1233,9 +1206,9 @@
 "Ортогонализирования формы!"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr "Отменить ортогонализирование формы"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1248,36 +1221,37 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr "Использование"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Выделенные элементы невозможно ортогонализировать"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Сделать углы прямыми"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Вставить"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Вставить содержимое буфера."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../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:32
+#: ../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:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1287,5 +1261,5 @@
 msgstr[2] "Вставляется {0} меток"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1295,59 +1269,59 @@
 msgstr[2] "для элементов {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Настройки..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Изменить настройки программы"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Вернуть последнее отменённое действие."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Переименовать файл"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../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/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Изменить направление линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Изменить направление всех выделенных линий."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Пожалуйста, выберите как минимум одну линию."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Изменить направление линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1355,10 +1329,10 @@
 msgstr "Сохранить"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Сохранить текущие данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1409,21 +1383,21 @@
 msgstr "Сохранить слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Сохранить как..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Сохранить текущие данные в новый файл."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Выбрать всё"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1433,10 +1407,10 @@
 "незаконченные объекты."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Показать отчёт о состоянии"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1444,19 +1418,19 @@
 "прикрепить к сообщению об ошибке"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Справка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Отчёт о состоянии"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Скопировать в буфер и закрыть"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1465,18 +1439,18 @@
 msgstr "Закрыть"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Разделить линию"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Разделить линию в выделенной точке."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Текущее выделение невозможно разделить."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1485,5 +1459,5 @@
 msgstr[2] "Выбранные точки не находится в середине какой-либо линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1502,9 +1476,9 @@
 "выберите также линию."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Выделенные точки не являются частью одной линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1513,10 +1487,10 @@
 msgstr[2] "Выделенная линия не содержит все выбранные точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Чтобы разделить замкнутую линию, выделите не менее двух точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1548,67 +1522,67 @@
 msgstr "Разделить линию {0} на {1} частей"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../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:15
+#: ../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:15
+#: ../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:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Разъединить линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Дублировать точки, используемые несколькими линиями."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Данная точка ни к чему не прикреплена."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Ни одна из этих точек ни к чему не прикреплена."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 "Ни одна из этих точек, находящихся на линиях, ни к чему не прикреплена."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Выделенные объекты невозможно разъединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Выберите один из вариантов:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Одна точка с метками, либо"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Одна точка, используемая несколькими линиями, либо"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 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:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 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:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1617,5 +1591,5 @@
 "несколькими линиями."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1628,9 +1602,9 @@
 "и все точки будут выделены."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Неприкрепленная точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1638,67 +1612,68 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Дублировать {0} точек в {1} точек"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Отменить последнее действие."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Снять выделение"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Снять выделение со всех объектов."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Снять выделение со всего (Фокус)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Снять выделение со всего (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Обновить данные"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+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:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Обновление данных"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr "Скачать данные"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Не найден текущий набор данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr "Объект с id {0} не найден в текущем наборе данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Обновить выделенное"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
@@ -1707,13 +1682,13 @@
 "заново)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Обновить выборку"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Не выделены элементы для обновления."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Выборка пуста"
@@ -1725,8 +1700,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "Загрузить на сервер OSM все изменения в текущем слое данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1737,5 +1713,5 @@
 "устранить.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1743,29 +1719,29 @@
 msgstr "Нет изменений для загрузки на сервер."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Нечего загружать. Сначала создайте данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr "Синхронизировать только точку {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr "Синхронизировать только линию {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Синхронизировать только отношение {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Синхронизировать весь набор данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1787,11 +1763,11 @@
 "редактирование.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Обнаружены конфликты"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1807,5 +1783,5 @@
 "продолжите редактирование.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1819,24 +1795,22 @@
 "пакет правок.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Пакет правок закрыт"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Отменить устранение конфликтов"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr "Подготовить устранение конфликта"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
-#, fuzzy
+msgstr "Щёлкните, чтобы скачать с сервера все родительские линии для точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr "Закрыть этот диалог и продолжить редактирование в JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr "Щёлкните, чтобы отменить и подтвердить правку карты"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1846,31 +1820,27 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+"<html>Загрузка на сервер <strong>не удалась</strong>, потому что вы пытались "
+"удалить точку {0}, которая ещё используется в линии {1}.<br><br>Щёлкните "
+"<strong>{2}</strong>, чтобы скачать с сервера все родительские линии точки "
+"{0}.<br>Если потребуется, JOSM создаст конфликты, которые вы сможете "
+"устранить в диалоге устранения конфликтов.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+msgstr "Точка ещё используется"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
-"Предупреждение: ошибочный заголовок \"{0}\" не соответствует ожидаемой "
-"структуре \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Загрузка на сервер <strong>не удалась</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Ошибка загрузки в OSM API"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+"Предупреждение: ошибка в заголовке \"{0}\" не соответствует ожидаемому "
+"образцу"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Обновление элемента"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1879,19 +1849,37 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, fuzzy, 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/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, fuzzy, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+"Предупреждение: элемент ''{0}'' уже удалён на сервере. Повторная загрузка на "
+"сервер будет произведена без этого элемента."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Загрузка данных на сервер ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"Игнорирование исключения, так как скачивание было отменено. Исключение было: "
+"{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Загрузить выделенное на сервер"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "Загрузить на сервер OSM все изменения в выбранном."
@@ -1910,11 +1898,11 @@
 msgstr "Проверка на удалённых родителей в локальном наборе данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Увеличить масштаб"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Уменьшить масштаб"
@@ -1994,21 +1982,17 @@
 msgstr "Играть медленнее."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Скачивание данных GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Скачанные GPX данные"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Данные GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Скачивание данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -2018,28 +2002,42 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "В этом месте нет данных."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Данные OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../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:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-"Во время скачивания большого массива данных обнаружены следующие ошибки:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Ошибка во время скачивания"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Обновление данных"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "видим (на сервере)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+#, fuzzy
+msgid ""
+"Click to check whether objects in your local dataset are deleted on the "
+"server"
+msgstr ""
+"{0} объект был очищен в локальном наборе данных, потому что он удалён на "
+"сервере."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Игнорировать"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Щёлкните, чтобы отменить и подтвердить правку карты"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2056,7 +2054,23 @@
 "<strong>{2}</strong> чтобы проигнорировать.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Удалённые или перемещённые элементы"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+"Во время скачивания большого массива данных обнаружены следующие ошибки:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Ошибка во время скачивания"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Ошибка во время скачивания"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2080,5 +2094,5 @@
 msgstr "Режим: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2109,38 +2123,38 @@
 msgstr "выделено"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 msgid "Add node"
 msgstr "Добавить точку"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Добавить точку к линии и объединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Создать новую точку"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Выделить точку под курсором."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2150,14 +2164,14 @@
 msgstr[2] "Вставить новую точку в {0} линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "Начать новую линию с последней точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Продолжить линию с последней точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Закончено вычерчивание"
@@ -2177,5 +2191,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
@@ -2186,5 +2200,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
@@ -2251,5 +2265,5 @@
 msgstr "Всегда перемещать и больше не показывать этого предупреждения"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2258,5 +2272,5 @@
 "объединения с ближайшей точкой."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2269,4 +2283,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Масштаб"
@@ -2286,5 +2301,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Поиск..."
@@ -2387,20 +2401,27 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>точки:</b>... - объект с заданным количеством точек"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - все измененные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - все выделенные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - все незаконченные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - все объекты без меток"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2409,5 +2430,5 @@
 "выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2416,5 +2437,5 @@
 "выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2422,5 +2443,5 @@
 "«или»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2428,9 +2449,9 @@
 "ключ содержит двоеточие)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Используйте <b>(</b> and <b>)</b> для группировки выражений"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2440,51 +2461,51 @@
 msgstr "Фильтр"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Поиск"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "Принять фильтр"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Начать поиск"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Не найдено совпадений для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Ничего не удалено из выделения в результате поиска ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Ничего не найдено в выделенном, при поиске ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Найдено {0} совпадений"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2519,26 +2540,40 @@
 "отношение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Неожиданный знак: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Отсутствуют параметры для \"ИЛИ\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Отсутствуют параметры для \"НЕ\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Отсутствует закрывающая скобка"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Неверное число параметров для оператора точек."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Неверное значение оператора точек: {0}. Оператор точек ожидает число точек "
+"или диапазон, например, точки:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Неверное число параметров для оператора точек."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2549,5 +2584,5 @@
 "или диапазон, например, точки:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2653,4 +2688,20 @@
 msgstr "Циклические зависимости"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2668,8 +2719,8 @@
 msgstr "Добавить отношение {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Очищено объектов: {0}"
+msgstr "Добавлено {0} объектов"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2753,5 +2804,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Двойной конфликт"
@@ -2789,4 +2840,15 @@
 msgstr "не могу устранить нерешенный конфликт"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "параметр ''{0}'' не должен быть пустым"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2821,33 +2883,6 @@
 msgstr[2] "Удалить {0} отношений"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Конфликтующее отношение"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Удалить из отношения"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>Выделенный объект \"{0}\" используется в отношении \"{1}\" в роли {2}."
-"<br>Удалить из отношения?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>Выделенный объект \"{0}\" используется в отношении \"{1}\".<br>Удалить "
-"из отношения?</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Разделить сегмент линии"
@@ -2855,6 +2890,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2866,5 +2901,5 @@
 "могут использовать их.<br> Вы действительно хотите удалить эти точки?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Удалить подтверждение"
@@ -3054,15 +3089,30 @@
 msgstr "Автоматически исправлять метки"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Текущее значение - ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "Ошибка: не удается сохранить свойства для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Ошибка в файле конфигурации на строках {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3073,5 +3123,5 @@
 "не является каталогом."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3082,5 +3132,5 @@
 "является каталогом.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3091,5 +3141,5 @@
 "отсутствующий каталог параметров: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3100,5 +3150,5 @@
 "каталог параметров: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3108,5 +3158,5 @@
 "параметрами по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3117,5 +3167,5 @@
 "параметров по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3126,5 +3176,5 @@
 "параметров к состоянию по умолчанию: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3135,5 +3185,5 @@
 "резервный<br>{0}<br> а новый будет создан с параметрами по умолчанию.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3144,19 +3194,42 @@
 "параметров {0} к состоянию по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Параметры сохранены на {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Невозможно загрузить параметры. Причина: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Невозможно скачать параметры с сервера."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3167,5 +3240,27 @@
 "Текст ошибки: {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+"Не удалось загрузить закладки с ''{0}'' в свези с проблемами безопасности. "
+"Текст ошибки: {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "НЕИЗВЕСТНО"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3187,20 +3282,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "Ю"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "С"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "З"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "В"
@@ -3212,4 +3307,18 @@
 msgid "Changeset {0}"
 msgstr "Пакет правок {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3276,14 +3385,14 @@
 msgstr "Предупреждение: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "обнаружен id >= 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "Элемент с id=0 не может быть невидимым"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3291,5 +3400,5 @@
 msgstr "обнаружено id > 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3318,6 +3427,6 @@
 "несколькими значениями."
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3377,72 +3486,72 @@
 msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Линия, обозначающая границу области, не замкнута."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "область с вложениями ''{0}'' не замкнута"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "В отношении «{0}» имеется участник, который был удален."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Линия «{0}» имеет меньше двух точек."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Обнаружена больше чем одна линия \"от\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Обнаружено больше одной линии \"до\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Найдено больше одного \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестная роль «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестный тип участника для «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Не найдена линия \"от\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Не найдена линия \"до\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Не найдена точка или линия \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "Линия \"from\" (от) не начинается или заканчивается на точке \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "Линия \"to\" (до) не начинается и не заканчивается на точке \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
@@ -3450,40 +3559,40 @@
 "\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 "Линия \"to\" (до) не начинается и не заканчивается на линии \"via\" (через)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стиль для ограничения {0} не найден."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Персечение между линиями ''{0}'' и ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Внутренняя линия «{0}» находится снаружи."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Нет полезной роли ''{0}'' для пути ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "не-линия ''{0}'' области с вложениями"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Для области с вложениями «{0}» отсутствует внешняя линия."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Персечение между линиями ''{0}'' и ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Внутренняя линия «{0}» находится снаружи."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
@@ -3491,5 +3600,5 @@
 "Стиль для внутренней линии ''{0}'' такой же, как у области с вложениями."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3505,11 +3614,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "текст"
+msgstr "для_текста"
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3528,5 +3636,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3538,5 +3645,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3567,5 +3673,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "фон"
@@ -3599,12 +3705,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Зоны Ламберта (Франция)"
+msgstr "Lambert 4 Zones (Франция)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Зоны Ламберта (Франция)"
+msgstr "Lambert CC9 Zone (Франция)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3640,5 +3744,5 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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>"
@@ -3646,5 +3750,5 @@
 "<html>Невозможно прочесть закладки с <br>''{0}''<br>Текст ошибки: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3673,5 +3777,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "железная дорога"
@@ -3688,4 +3792,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3703,33 +3809,33 @@
 msgstr[2] "{0} участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Нарушение предварительного условия"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Ошибка безопасности"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Ошибка сети"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "Ошибка Ввода-вывода"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Внутренняя ошибка сервера"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Неверный запрос"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr "Не найдено"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3737,16 +3843,16 @@
 msgstr "Конфликт"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Неизвестный хост"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr "Объект удалён"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr "Показать справочную информацию"
@@ -3759,4 +3865,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Скачивается \"Сообщение дня\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Закрыть диалог"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3826,74 +3937,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Имя пользователя"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "использование"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Показать эту справку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Стандартный параметр геометрии unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Скачать область в пределах рамки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Открыть файл (как данные GPS, если .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Скачать область в пределах рамки, как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Выбор с учетом поиска"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Запуск в развернутом виде"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Восстановить параметры по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Установить язык."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr "системные настройки Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr "Сменить папку для всех настроек пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3905,9 +4016,9 @@
 "      настройки Java для увеличения максимально размера используемой памяти"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "примеры"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3917,25 +4028,25 @@
 "убедитесь, что загружаете данные перед --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Вместо --download=<bbox> можно указать osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Включение обновлённых модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Загрузка ранних модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Загрузка модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3950,11 +4061,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3979,6 +4090,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4081,25 +4192,22 @@
 msgstr "(нет объекта)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "Пользователь:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "слоя нет в списке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Слой ''{0}'' должен быть в списке слоёв"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Ошибка разбора"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Файл не найден"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Нет, отменить действие"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4120,5 +4228,5 @@
 msgstr "unset: не устанавливать этот параметр у выделенных объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4126,50 +4234,49 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125
-#, fuzzy
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
 "relation</strong>.</html>"
 msgstr ""
-"<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
+"<html>Пожалуйста, подтвердите удаление <strong>1 объекта</strong> из "
+"<strong>1 отношения</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
 "relations</strong>.</html>"
 msgstr ""
-"<html>Версия <strong>{0}</strong> Создано на <strong>{1}</strong></html>"
+"<html>Пожалуйста, подтвердите удаление <strong>1 объекта</strong> из <strong>"
+"{0} отношений</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131
-#, fuzzy, java-format
+#, 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>"
+"<html>Пожалуйста, подтвердите удаление <strong>{0} объектов</strong> из "
+"<strong>{1} отношений</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Удалить {0} объект"
-msgstr[1] "Удалить {0} объекта"
-msgstr[2] "Удалить {0} объектов"
+msgstr[0] "Удаление {0} объекта"
+msgstr[1] "Удаление {0} объектов"
+msgstr[2] "Удаление {0} объектов"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Удалить {0} объект"
+msgstr "Удалить объекты"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "не удалён"
+msgstr "Удалить"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Отношение"
+msgstr "Из отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4181,5 +4288,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4189,9 +4296,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327
 msgid "Click to close the dialog and remove the object from the relations"
-msgstr ""
+msgstr "Щёлкните, чтобы закрыть диалог и удалить объект из отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340
 msgid "Click to close the dialog and to abort deleting the objects"
-msgstr ""
+msgstr "Щёлкните, чтобы закрыть диалог и отменить удаление объектов"
 
 #. *
@@ -4228,5 +4335,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4243,5 +4350,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4458,8 +4565,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4795,6 +4902,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4808,6 +4915,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4865,36 +4972,36 @@
 msgstr "Их набор данных не содержит метку с ключом {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr "Конфликты при объединении элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr "Возникли конфликты при объединении линий - полученная линия: ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, fuzzy, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
 msgstr "Конфликт при слиянии точек - объединённая точка ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr "Конфликтов не обнаружено"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Применить"
@@ -4906,5 +5013,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "все"
@@ -4996,4 +5103,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -5005,4 +5114,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -5018,49 +5128,86 @@
 "Позиция {0} за пределами допустимого. Текущее количество участников {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr "Удалить этого участника из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Заменить"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr "Заменить линию этим участником, связанным с объединённой линией"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "Сохранить мои"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Удалить этого участника из отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr "Нерешённый"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr "Ещё не решено"
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Роль:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Задать роль для выделенных участников"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#, fuzzy
+msgid "Tag modified relations with "
 msgstr "Метка изменённых отношений с   "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../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 ""
+
+#: ../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:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Загрузка на сервер <strong>не удалась</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Значение:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "Назначить эту роль всем участникам"
@@ -5098,6 +5245,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5190,10 +5337,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5260,5 +5404,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5303,4 +5448,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Включить"
@@ -5326,6 +5472,6 @@
 msgstr "Информация о слое"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5335,22 +5481,22 @@
 msgstr[2] "Это изменит до {0} объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Пустое значение удаляет ключ."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<различные>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Изменить значения?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5360,69 +5506,73 @@
 msgstr[2] "Изменить параметры {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Пожалуйста, выберите ключ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Выберите значение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Выберите объекты, для которых вы желаете изменить параметры."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Параметры/Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Параметры выделенных объектов."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Член группы"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Добавить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Изменить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойств: {0} / Участников: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Параметры / Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Изменить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Удалить из отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Удалить выделенный ключ из всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Удалить параметры"
@@ -5430,40 +5580,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Показать список всех отношений."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Отношения: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Открыть редактор для выбранного отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Удалить выбранное отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Создать новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Создать копию этого отношения и открыть его в другом окне редактора"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr "Установить текущий выбор на списке выделенных отношений"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Удалить выбранное отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Выберите один из вариантов:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Скачать выбранные отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Скачать участников"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5490,5 +5660,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5500,9 +5670,9 @@
 msgstr "Выбор: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Отсоединить панель"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5511,5 +5681,5 @@
 "панели."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Щёлкните для уменьшения/увеличения содержимого панели"
@@ -5598,5 +5768,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Скачать участников отношений"
@@ -5628,5 +5799,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
@@ -5635,18 +5806,18 @@
 "Исключение: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Метки и участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
-msgstr "Отношения родителя"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+msgstr "Родительские отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
-msgstr "Отношения наследника"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+msgstr "Наследники отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5658,14 +5829,14 @@
 "хотите продолжать с циклическими отношениями?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr "Удалить их, почистить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr "Игнорировать их, оставить отношение как есть"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5678,9 +5849,9 @@
 "участника отношения?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr "Несколько участников, относящихся к одному и тому же элементу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5693,5 +5864,5 @@
 "''{0}'' будет пропущено.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5700,5 +5871,5 @@
 "участником"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5707,5 +5878,5 @@
 "участника"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5715,5 +5886,5 @@
 "выделенным участником"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5723,20 +5894,20 @@
 "выделенного участника"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr "Редактор отношений: удалить выделенное"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "Выделить участников отношения, которые относятся к выбранным элементам"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5747,67 +5918,68 @@
 "выделенных элементов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr "Выделить элементы для выделенных участников отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Сортировать участников отношений"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "Редактор отношений: сортировать"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Переместить выделенных участников отношения вверх"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "Редактор отношений: поднять"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Переместить выделенных участников отношения вниз"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "Редактор отношений: опустить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr "Удалить отмеченных участников из отношения"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "Редактор отношений: удалить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr "Удалить редактируемое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "Да, создать конфликт и закрыть"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Да, создать конфликт и закрыть"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr "Щёлкните, чтобы создать конфликт и закрыть этот редактор отношений"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "Нет, продолжить редактирование"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+"Щёлкните, чтобы вернуться в редактор отношений и продолжить редактирование "
+"отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5819,9 +5991,9 @@
 "создать конфликт и закрыть редактор?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "Конфликт в данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5832,41 +6004,41 @@
 "<br>Пожалуйста, устраните этот конфликт, прежде чем продолжать.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "Записать внесённые изменения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Применить обновления и закрыть диалог"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Отменить обновления и закрыть диалог"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Добавить пустую метку"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Скачать недостающие части линий и точки, участвующие в отношении"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Скачать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr "Редактор отношений: скачать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Задать роль для выделенных участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Применить роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5879,17 +6051,17 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "Да, записать"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "Нет, не записывать"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr "Подтвердить пустую роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Выделенный, при редактировании отношения, участник относится к"
@@ -5900,14 +6072,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 "Масштабировать элемент, к которому относится первый выделенный участник"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Масштабирование отменено, потому что слой этого отношения не активен"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr "Масштабирование отменено, потому что вы не выбрали участника"
@@ -5921,14 +6093,14 @@
 msgstr "Связанные"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr "Скачать ссылающиеся отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr "Ожидалось значение наследника.getId() > 0. Получено {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5943,9 +6115,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
 msgid "Load parent relations"
-msgstr "Скачать отношения родителей"
+msgstr "Скачать родителей отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
 msgid "Loading parent relations"
-msgstr "Скачивание отношений родителей"
+msgstr "Скачивание родителей отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
@@ -5982,60 +6154,90 @@
 "Исключение было: "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Не подключено"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr "линия соединена"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Сортировать участников отношений"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr "линия соединена с предыдущим участником отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Сортировать участников отношений"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr "линия соединена со следующим участником отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+"линия не соединена ни с предыдущим, ни со следующим участником отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Закладки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Пожалуйста, введите сначала желаемые координаты"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#, fuzzy
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "В данный момент нет открытого пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Создать границы"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Изменить выбранное отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Пожалуйста, введите название места."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr "Название места"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Сначала выберите закладку"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Переместить выделенных участников отношения вверх"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Переместить выделенных участников отношения вверх"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "мин. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "мин. долгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "макс. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "макс. долгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -6045,22 +6247,74 @@
 "область)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Рамка"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Источники и типы данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Данные OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Разделить линию в выделенной точке."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Данные GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Выделенная линия не содержит все выделенные точки"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Скачать как новый слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Область для скачивания"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Скачать"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Нет выделенного отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -6068,350 +6322,65 @@
 "запрос."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Область для скачивания приемлема по площади."
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Щёлкните, чтобы закрыть диалог и отменить удаление объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Изменить выбранное отношение"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Пожалуйста, выберите ряд для редактирования."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Название места для поиска:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Название места для поиска:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Пустой указатель исключение, возможно есть отсутствующие метки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Задайте строку для поиска"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Не удается получить результаты поиска"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Название места для поиска:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Места"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "тип"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "возле"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "масштаб"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-"<b>Масштабировать:</b> Крутите колёсико мыши, сделайте двойной щелчок или "
-"нажмите Ctrl + Вверх/Вниз <b>Двигать карту:</b> Удерживая правую кнопку "
-"мышки, двигайте мышку или используйте клавиши передвижения курсора. "
-"<b>Выбрать:</b> Удерживая левую кнопку мышки, нарисуйте рамку."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Интерактивная карта"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "масштаб"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x от"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "до"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y от"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Номера квадратов"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, 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:164
-msgid "JOSM Help Browser"
-msgstr "Браузер справки JOSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>Невозможно установить соединение с удаленным сервером<br>''{0}''."
-"<br>Пожалуйста проверьте свое подключение к интернету.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr "Открыть текущую страницу справки во внешнем браузере"
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr "Править текущую страницу справки"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr "Загрузить заново текущую страницу справки"
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr "Перейти на предыдущую страницу"
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr "Перейти на следующую страницу"
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr "Перейти на начальную страницу справки JOSM"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
 #, fuzzy
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-"Предупреждение: не удалось прочитать MOTD из ''{0}''. Исключение было: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Search ..."
+msgstr "Поиск..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
 #, fuzzy
-msgid "Failed to open help page"
-msgstr "Загрузить заново текущую страницу справки"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-"Невозможно прочитать команду. Выход из браузера справки. Исключение было:"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr "Не удалось запустить внешний браузер справки"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr "Широта: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr "Долгота: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr "Координаты"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "История точки {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "История линии {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "История для отношения {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Закрыть диалог"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr "Скачать историю с сервера"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"История ещё не инициализирована. Не удалось настроить ссылку на элемент."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-"Не удалось настроить ссылку. ID ссылки: {0} не соответствует ID истории: {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, 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:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr "История ещё не инициализирована. Не удалось настроить текущий элемент."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, 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:51
-msgid "Load history"
-msgstr "Загрузить историю"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr "Ожидался объект с id > 0 . Получено {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr "Скачивание истории для точки {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr "Скачивание истории линии {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, 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:79
-#, java-format
-msgid "Node {0}"
-msgstr "Точка {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Линия {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Отношение {0}"
+msgid "Click to start searching for places"
+msgstr "Направление для поиска места"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6768,4 +6737,6 @@
 #. 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" />
@@ -7146,6 +7117,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7211,11 +7183,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7225,6 +7197,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7234,79 +7206,371 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Название"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Тип"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "возле"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+"<b>Масштабировать:</b> Крутите колёсико мыши, сделайте двойной щелчок или "
+"нажмите Ctrl + Вверх/Вниз <b>Двигать карту:</b> Удерживая правую кнопку "
+"мышки, двигайте мышку или используйте клавиши передвижения курсора. "
+"<b>Выбрать:</b> Удерживая левую кнопку мышки, нарисуйте рамку."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Интерактивная карта"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "масштаб"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x от"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "до"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y от"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Номера квадратов"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, 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:164
+msgid "JOSM Help Browser"
+msgstr "Браузер справки JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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}\">help на русском ({1})</a> и "
+"статью <a href=\"{3}\">help на английском языке</a>.</p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+"<html>Не удалось открыть справочную страницу по ссылке {0}.<br>Возможно в "
+"сети проблемы, поэтому проверьте<br>ваше интернет-соединение</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr "Не удалось открыть ссылку"
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr "Открыть текущую страницу справки во внешнем браузере"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr "Править текущую страницу справки"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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:391
+msgid "Reload the current help page"
+msgstr "Загрузить заново текущую страницу справки"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr "Перейти на предыдущую страницу"
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr "Перейти на следующую страницу"
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr "Перейти на начальную страницу справки JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+"Предупреждение: плохое расположение в документе HTML. Исключение было: "
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr "Не удалось открыть справочную страницу. Ссылка пуста."
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr "Не удалось открыть справочную страницу"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+"Невозможно прочитать команду. Выход из браузера справки. Исключение было:"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr "Не удалось запустить внешний браузер справки"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr "Широта: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr "Долгота: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr "Координаты"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "История точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "История линии {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "История для отношения {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Закрыть диалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr "Скачать историю с сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+"История ещё не инициализирована. Не удалось настроить ссылку на элемент."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+"Не удалось настроить ссылку. ID ссылки: {0} не соответствует ID истории: {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, 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:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr "История ещё не инициализирована. Не удалось настроить текущий элемент."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, 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:51
+msgid "Load history"
+msgstr "Загрузить историю"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr "Ожидался объект с id > 0 . Получено {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr "Скачивание истории для точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr "Скачивание истории линии {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, 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:79
+#, java-format
+msgid "Node {0}"
+msgstr "Точка {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Линия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Отношение {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Пользователь"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr "Пакет изменений"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7389,4 +7653,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr "Открыть диалог выбора файла"
@@ -7720,6 +7985,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "Изменить {0} объект:"
@@ -7826,5 +8091,16 @@
 msgstr "требуется идентификатор пакета правок > 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, 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:105
 msgid "Preparing primitives to upload ..."
 msgstr "Подготовка элементов к загрузке на сервер ..."
@@ -7858,59 +8134,59 @@
 msgstr "Продолжить загрузку на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Изображения для {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Прочесть GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Нет указания времени для точки {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Невозможно прочесть время \"{0}\" у точки  {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Чтение {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Не найдено изображений с информацией о времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Чтение {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Изображения с данными о местоположении"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Начало GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Конец GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "текущая разница: {0} с."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "разница в часовых поясах: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7919,51 +8195,51 @@
 msgstr[2] "изображений"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} в пределах трека"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Синхронизация часов"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Изображения JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Невозможно прочесть дату из файла \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "EXIF файла \"{0}\" не содержит информации о времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Изображение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Введите указанную дату (мм/дд/гггг ЧЧ:MM:СС)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Часовой пояс GPS объекта (отличается от фотографии)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Синхронизировать время с GPS приёмником"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Введённое время невозможно использовать"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7971,30 +8247,30 @@
 msgstr "точка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Настроить отрисовку линий"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Использовать глобальные настройки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Отображать линии между точками для этого слоя."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Не отображать линии между точками для этого слоя."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Выбрать варианты отрисовки линий"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -8002,5 +8278,5 @@
 msgstr "Выбрать цвет"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -8009,5 +8285,5 @@
 msgstr "По умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -8016,43 +8292,43 @@
 msgstr "Выбор цвета"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Маркеры из именованых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Именованные точки трека из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Импортировать аудиофайлы"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Аудиофайлы Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудиомаркеры из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Импорт изображений"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Название: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -8063,28 +8339,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr "Период"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "Длина"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Длина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -8094,5 +8370,5 @@
 msgstr[2] "{0} маршрутов, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -8102,10 +8378,10 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Преобразовать в слой данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -8115,11 +8391,11 @@
 "считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -8129,29 +8405,29 @@
 msgstr "Преобразовано из: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Скачать с OSM данные вдоль этого трека"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Скачать всё в пределах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Максимальная область для одного запроса:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -8162,13 +8438,9 @@
 "Продолжить?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr "Скачать данные"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8178,5 +8450,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8186,24 +8458,24 @@
 "проигнорированы при рассчете времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Слой данных {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "вне области для скачивания"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8213,12 +8485,13 @@
 msgstr[2] "Обнаружено {0} конфликтов."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, fuzzy, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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} объект был очищен в локальном наборе данных, потому что он удалён на "
@@ -8232,29 +8505,51 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
+#, fuzzy, 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] ""
 "Пожалуйста, обратитесь к диалоговому окну списка конфликтов<br>и уладьте "
 "конфликты вручную."
-
+msgstr[1] ""
+"Пожалуйста, обратитесь к диалоговому окну списка конфликтов<br>и уладьте "
+"конфликты вручную."
+msgstr[2] ""
+"Пожалуйста, обратитесь к диалоговому окну списка конфликтов<br>и уладьте "
+"конфликты вручную."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Закрыть этот диалог и продолжить редактирование в JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, 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:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} состоит из:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} удалено)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "отключено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "Версия API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8434,6 +8729,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8448,6 +8741,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8634,5 +8925,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8976,21 +9267,20 @@
 msgstr "Язык"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Использовать настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
-msgstr "Использованный стиль"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -9004,6 +9294,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Обновить"
@@ -9154,70 +9443,106 @@
 msgstr "Горячая клвиша"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Включить"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr "Пути к иконкам"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Краткое описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "Автор: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Веб-страница: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Версия: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr "Пути к иконкам"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Копировать умолчания"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Пожалуйста, выберите ряд для копирования."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-"Источник XML (URL-ссылка или имя файла) для заданных файлов в кол-ве {0} шт.."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr "Добавить новый XML источник к списку."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Удалить источник из списка."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-"Значения по умолчанию (Смотрите подсказки, чтобы узнать больше об этом)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Удалить выделенные записи из объединённого списка элементов"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Изменить значение выбранного ключа для всех объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "Удалить выделенные записи из объединённого списка элементов"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Добавить новую метку"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Закрыть выбранные открытые пакеты правок"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Править выбранный источник."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Скачивание истории для точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, 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>Подробнее: {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, fuzzy, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr "IНеверное значение для атрибута ''{0}''. Получено''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Сортировать меню предустановок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9420,5 +9745,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Подробнее"
@@ -9484,16 +9809,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Группа настроек ''{0}''"
+msgstr "Группа предустановок {1} / {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Группа настроек ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr "Группа предустановок {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9501,5 +9826,5 @@
 msgstr "Подключение к серверу OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9610,5 +9935,5 @@
 msgstr "Парсинг файла \"{0}\" потерпел неудачу"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ошибка разбора: неправильная структура документа gpx"
@@ -9844,5 +10169,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9869,5 +10194,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9875,5 +10200,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9886,5 +10211,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9895,50 +10220,50 @@
 msgstr "Анализ списка пакетов правок..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Неправильный пароль или имя пользователя."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Внимание: Пароль будет передан в незашифрованном виде."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Сохранить имя пользователя и пароль (не зашифровано)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Введите пароль"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Войти"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Основной адрес сервера OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Логин (e-mail) учётной записи OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Основной адрес сервера"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "Имя пользователя OSM (E-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM пароль"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -10049,5 +10374,5 @@
 msgstr "Файл \"{0}\" не существует"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -10058,19 +10383,19 @@
 "minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr "Найти элемент XML <nd> не как прямого наследника элемента <way>."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "Отсутствует обязательный атрибут ''{0}'' на <nd> линии {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, 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:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
@@ -10078,10 +10403,10 @@
 "<relation> (отношение)."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Отсутствует атрибут ''ref'' у участника отношений {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
@@ -10089,10 +10414,10 @@
 "Неверное значение атрибута ''ref'' у участника отношения {0}. Получено {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Отсутствует атрибут ''type'' у участника {0} отношения {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -10102,9 +10427,9 @@
 "{2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Неполная спецификация <member> с ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
@@ -10112,10 +10437,10 @@
 "Неопределённый элемент ''{0}'' обнаружен во входящем потоке. Пропущено."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Недопустимый объект с id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -10126,7 +10451,11 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -10138,25 +10467,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Неизвестная или неподдерживаемая версия API. Получено {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "Отсутствует атрибут ''version'' на элементе OSM с ID {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "Отсутствует нужный атрибут ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Неверная длина значения атрибута ''{0}''. Получено ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -10165,5 +10494,5 @@
 "Линия с внешним ID ''{0}'' содержит отсутствующую точку с внешним ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -10174,5 +10503,5 @@
 "мере одна точка отсутствовала в скачанных данных."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -10181,5 +10510,5 @@
 "Неизвестный тип участника отношения ''{0}'' в отношении с внешним id ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -10190,13 +10519,13 @@
 "внешним id ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Подготовка данных..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr "Разбор данных OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr "Подготовка набора данных..."
@@ -10207,14 +10536,13 @@
 msgstr "требуется параметр id ''{0}'' > 0. Получен {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Скачать с OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr "Скачивание с сервера OSM..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr "Скачивание зависимых линий ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr "Скачивание зависимых отношений..."
@@ -10335,15 +10663,15 @@
 "Загрузка изменений на сервер будет проигнорирована."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Обновить модули"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Скачать модули"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10356,30 +10684,34 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "{0} модуль успешно скачен. Пожалуйста, перезагрузите JOSM."
 msgstr[1] "{0} модуля успешно скачено. Пожалуйста, перезагрузите JOSM."
 msgstr[2] "{0} модулей успешно скачено. Пожалуйста, перезагрузите JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Скачивание модуля {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Пропустить скачивание"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Скачать модуль"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Пропустить скачивание"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10391,10 +10723,10 @@
 msgstr "В модуле {0} произошла ошибка"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr "Был запрос на загрузку модуля {0}. Этот модуль бульше не нужен."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10407,49 +10739,58 @@
 "отключён.<br>Удалить из настроек?</html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Последнее обновление модуля было более {0} дней назад"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Обновить модули"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Модуль {0} требует обновить JOSM до версии {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Модуль {0} требуется модулю {1}, но не найден."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Модуль не найден: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Последнее обновление модуля было более {0} дней назад"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Можно указать, с каким промежутком в днях будет появляться<br>данное "
-"предупреждение, установив параметр настроек 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Невозможно загрузить модуль {0}. Удалить из настроек?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Отключить модуль"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Сохранить модуль"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10459,9 +10800,9 @@
 "разрешение переписывать существующие модули."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10469,10 +10810,10 @@
 msgstr "Произошла неожиданная ошибка. Возможно, она вызвана модулем ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Согласно информации в модуле, автором является {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10481,9 +10822,9 @@
 "ошибке."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Отключить модуль?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10493,22 +10834,22 @@
 "модуль."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr "Не удается удалить модуль. Возможно он уже выключен"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Информация о модуле"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "описание отсутствует"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Подробнее"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10518,18 +10859,18 @@
 msgstr[2] "Список модулей загружен с {0} сайтов"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Информации о модулях не найдена."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Плагин {0} не доступен. Обновление пропущено."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Все установленные модули имеют последнюю версию."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10542,9 +10883,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Скачать недостающие модули"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10559,9 +10900,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10583,19 +10924,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "неизвестный"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Версия {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Модуль из поставки JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10661,5 +11002,5 @@
 msgstr "(Текст уже скопирован в буфер обмена)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10670,5 +11011,5 @@
 "адрес сервера в настройках и соединение с интернет.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10680,5 +11021,5 @@
 "ожидания.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10691,5 +11032,5 @@
 "удалите ссылку на отношение {0}, затем снова загрузите на сервер.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10702,10 +11043,10 @@
 "{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr "Сервер сообщил о неудавшемся разборе даты ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10716,5 +11057,5 @@
 "он уже был закрыт.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10725,18 +11066,18 @@
 "он уже был закрыт в {1}.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
-#, java-format
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
+#, fuzzy, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
+"(untranslated):<br>{0}</html>"
 msgstr ""
 "<html>Сервер сообщил, что обнаружен конфликт.<br>Сообщение об ошибке (не "
 "переведено):<br>{0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr "<html>Сервер сообщил, что обнаружен конфликт.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10749,5 +11090,5 @@
 "формы приложения ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10758,5 +11099,5 @@
 "<br>Пожалуйста проверьте свое подключение к интернету.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10767,5 +11108,5 @@
 "проблемы передачи данных.<br>Подробнее: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10776,10 +11117,10 @@
 "временная проблема. Пожалуйста, попробуйте позднее.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "Сервер OSM ''{0}'' сообщил о неудачном запросе.<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10791,10 +11132,10 @@
 "средствами экспорта файлов OSM."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Сообщение об ошибке (на английском): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10809,5 +11150,5 @@
 "Пожалуйста, внимательно проверьте адрес сервера ''{0}'' на предмет опечаток."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10820,5 +11161,5 @@
 "программы и ваше соединение с интернет.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10833,5 +11174,5 @@
 "<br><br>Сообщение об ошибке:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10863,4 +11204,6 @@
 "''{0}''. Using default code ''en''."
 msgstr ""
+"Предупреждение: не удалось извлечь префикс языка вики из локального кода "
+"JOSM ''{0}''. Используется код по умолчанию ''en''."
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
@@ -10949,13 +11292,4 @@
 "Параметр с ключом ''{0}'' не существует. Невозможно восстановить геометрию "
 "окна с помощью параметров.."
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
-msgstr ""
-"Предупреждение: Не удалось восстановить геометрию окна из ключа ''{0}''. "
-"Геометрия приведена к состоянию по умолчанию. Детали: {1}"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -11105,5 +11439,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -11119,10 +11454,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Нечетные"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -11130,93 +11465,93 @@
 msgstr "Четные"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr "По алфавиту"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr "Отношение: {0}"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr "Связать с улицей, используя:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr "Схема нумерации:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr "От №:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr "До №:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr "Будет присоединено {0} дополнительных точек номеров домов"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr "Город:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr "Штат:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr "Почтовый индекс:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr "Страна:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr "Полный адрес:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr "Дополнительная информация:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 "Пожалуйста, выберите улицу, чтобы связать её с интерполяцией адресов на линии"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr "Пожалуйста выберите интерполяцию адресов на линии для этой улицы"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr "Заявлены нечётные номера домов"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr "Заявлены чётные номера домов"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr "Код страны должен состоять из 2 букв"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr "Пожалуйста, введите начальный и конечный номера домов"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr "Алфавитные номера домов должны начинаться с буквы"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 "Начальный и конечный номера должны быть одинаковыми для буквенных адресов"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
@@ -11224,13 +11559,13 @@
 "к началу алфавита, чем буква номера дома, находящегося  в конце улицы"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr "Пожалуйста, введите правильный номер для начала нумерации домов"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr "Пожалуйста, введите правильный номер последнего дома"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr "Начальный номер дома должен быть меньше, чем конечный номер дома"
@@ -11284,46 +11619,47 @@
 "{0} км/ч"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Извлечение GPS координат из EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Запуск сканирования каталога"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Один из выбранных файлов пуст!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Загрузка фото..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Не удалось получить канонический путь к каталогу {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Скнирование каталога {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Найден пустой файл в каталоге {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Ошибка чтения файлов в каталоге {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Коррелируют с GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11588,5 +11924,5 @@
 msgstr "Ошибка в файле {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11602,10 +11938,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr "Выбрать Feuille (слой??)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11655,13 +11991,13 @@
 msgstr "Выбрать из..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Кадастр"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Авто источники"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11673,13 +12009,13 @@
 "Вы хотите назначить на клавишу F11 функцию захвата?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr "Восстановить действие захватывающей клавиши F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM остановлено для того, чтобы проявились изменения."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11800,7 +12136,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Отображать координаты как"
+msgstr "Показать перекрестья:"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11818,5 +12153,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11859,13 +12194,13 @@
 msgstr "Создать границы"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr "Связываюсь с кадастром WMS ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr "Изображение уже загружено"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11922,4 +12257,6 @@
 "Do you want to use them ?"
 msgstr ""
+"Это изображение содержит данные геоссылок.\n"
+"Вы хотите воспользоваться ими?"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:169
@@ -11988,5 +12325,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:32
 msgid "Set manually the Lambert zone"
-msgstr ""
+msgstr "Задать вручную Lambert zone"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:43
@@ -12005,24 +12342,24 @@
 #, java-format
 msgid "{0} not allowed with the current projection"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+msgstr "{0} не позволено в текущей проекции"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Изменить расположение"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Установить новое место для следующего запроса"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Добавить новый слой"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Расположение"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -12032,5 +12369,5 @@
 "пунктуацию опубликованную www.cadastre.gouv.fr </html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Добавить новый слой"
@@ -12044,9 +12381,9 @@
 msgstr "Получить новые кукисы (тайм-аут сеанса)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr "Файлы PNG (*.png)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr "Экспортировать в формате PNG (только растровые изображения)"
@@ -12070,9 +12407,11 @@
 msgstr "Подогнать позицию WMS слоя (только растровые изображения)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
 "a cadastre \"plan image\" (raster image)"
 msgstr ""
+"Этот режим работает, только если активный слой\n"
+"кадастра \"plan image\" (растровое изображение)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
@@ -12092,5 +12431,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Пустой слой"
@@ -12119,5 +12458,5 @@
 msgstr "общий квадрат: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -12128,18 +12467,18 @@
 "Создайте новый файл."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Ошибка формата кеша"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "Зона Ламберта {0} в кеше несовместима с текущей зоной Ламберта {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Ошибка кеширования зоны Ламберта"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -12149,4 +12488,8 @@
 "manually the Lambert zone from the Cadastre menu"
 msgstr ""
+"Текущий слой в Lambert CC9 Zone это \"{0}\"\n"
+"где коммуна в Lambert CC9 Zone это \"{1}\".\n"
+"Загрузите на сервер изменения, закройте все слои\n"
+"и измените вручную Lambert zone в меню Кадастр"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:67
@@ -12237,5 +12580,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Никаких данных не загружено"
@@ -12644,7 +12987,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "вода"
@@ -12860,33 +13203,33 @@
 msgstr "Слой LiveGPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Захват трека GPS"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Связаться с сервером gpsd и показать текущее положение на слое LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Центрировать"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Центрировать слой LiveGPS на текущей позиции"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Авто-центровка"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Продолжить центрировать слой LiveGPS на текущей позиции"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12977,24 +13320,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr "Создать мультиполигон"
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr "Создать мультиполигон."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr "Одна из выделенных линий уже является частью другого мультиполигона."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr "Мультиполигон должен состоять только из замкнутых линий."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr "Вы должны выделить, как минимум, две линии."
@@ -13150,4 +13493,9 @@
 msgstr "исполняемый файл Firefox"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Слой"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -13196,31 +13544,31 @@
 msgstr "Разрешённые действия"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../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:124
+#: ../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:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Разрешить действие?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Подтверждение действия дистанционного управления"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr "Пультом управления было предложено создать новую точку."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -13241,7 +13589,5 @@
 msgstr "Нет выделенного отношения"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -13250,4 +13596,5 @@
 #: ../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 "Маршрутизация"
@@ -13269,25 +13616,25 @@
 msgstr "Открыть список точек маршрута"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Очистить маршрут"
@@ -13317,93 +13664,87 @@
 msgstr "Введите значение толщины"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Интерактивная карта"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Авто приближение: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Загрузить квадрат карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "Показать статус квадрата карты"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Запросить обновление"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Показать информацию"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Скачать все квадраты карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Приблизить"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Отодвинуть"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr "Очистить кеш квадрата карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "изображение "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "Автозум"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "ПростаяКарта"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Настройки модуля SlippyMap."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Источник квадратов карты"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Авто приближение: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Автозагружаемые квадраты карты: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Уровень макс. приближения: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Уровень макс. приближения: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Бледный фон: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "ошибка загрузки метаданных"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr "ошибка запроса обновления: уровень масштабирования не 12"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "предлагается: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "ошибка при запросе обновления"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -13416,5 +13757,5 @@
 msgstr "Сохранять захваченные данные в файл каждую минуту."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13583,5 +13924,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Название улицы"
@@ -13630,30 +13971,30 @@
 "быть объединены."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "Пересечений не найдено. Изменений сделано не было."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Добавлены точки на всех пересечениях"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 "Удалить линии, которые не являются внутренней частью области с вложениями"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Исправить отношения"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Присоединить самоперекрывающиеся области"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Присоединить перекрывающиеся области"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13663,33 +14004,33 @@
 "Пожалуйста, проверьте не появились ли ошибки."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Введите значения для всех конфликтов."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Решение конфликтов"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Исправить конфликт меток"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Удалённый из отношений элемент"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Присоединить районы: удаление коротких путей"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Замкнутая линия"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Удалить метки у внутренних линий"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Присоединить районы функционирования"
@@ -13902,8 +14243,4 @@
 msgstr "Исправить выделенные ошибки."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Игнорировать"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13948,25 +14285,24 @@
 msgstr "Заменить \"{0}\" на \"{1}\" для"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Береговые линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Этот тест проверяет павильность береговых линий."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
-msgstr "Неупорядоченная береговая линия"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Неупорядоченная береговая линия"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+msgid "Unconnceted coastline"
+msgstr "Несоединённая береговая линия"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Неупорядоченная береговая линия"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr "Обратная береговая линия"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13991,18 +14327,18 @@
 msgstr "Пересекающиеся линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Дублированные точки"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Точки в одной и той же позиции"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Подтверждение"
@@ -14255,4 +14591,8 @@
 msgstr "Править выбранный источник."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Удалить источник из списка."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14472,7 +14812,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "здание"
@@ -14486,5 +14826,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "область"
@@ -14494,26 +14834,26 @@
 msgstr "Незамкнутая линия"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Несоединённые линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Последняя точка линии расположена около другой дороги"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Конец линии расположен около другой линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Точка линии расположена около другой линии"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Конечная точка присоединённой линии расположена около другой линии"
@@ -14609,22 +14949,26 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
-#, fuzzy
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr "Walking Papers: {0}"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr "Walking Papers"
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "Выделите начальную точку на конце линии"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "Достигнут конец линии"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "Достигнут перекрёсток"
@@ -14898,9 +15242,9 @@
 msgstr "Ошибка формата файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Открыть пустой WMS-слой для загрузки данных из файла"
@@ -15400,6 +15744,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Сноска"
@@ -15961,5 +16305,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr "металл"
@@ -15971,5 +16315,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "лес"
@@ -16257,7 +16601,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "да"
@@ -16406,8 +16750,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "нет"
@@ -16534,31 +16878,4 @@
 msgstr "Править перекрёсток"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Тип"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16679,5 +16996,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "дорога местного значения"
@@ -16712,5 +17029,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "служебный проезд"
@@ -16745,5 +17062,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "строящаяся дорога"
@@ -17133,12 +17450,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Оператор"
@@ -17351,6 +17668,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Возвышение"
@@ -17777,5 +18094,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "Болото"
@@ -18308,25 +18625,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Часы работы"
@@ -18392,24 +18709,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr "24/7"
@@ -18422,24 +18739,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Пн-Пт 08:30-20:00"
@@ -18452,24 +18769,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Вт-Вс 08:00-15:00; Sa 08:00-12:00"
@@ -18502,6 +18819,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Справочный номер"
@@ -18517,5 +18834,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "подземная"
@@ -18529,5 +18846,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Денежный сбор"
@@ -18764,5 +19081,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Навес"
@@ -19230,5 +19547,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Велоспорт"
@@ -19243,5 +19560,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Лыжный спорт"
@@ -19395,16 +19712,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Место раскопок"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Править Место раскопок"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Памятник"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Править Памятник"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Мемориал"
@@ -19412,55 +19742,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Править Мемориал"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Править придорожный крест"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Править придорожную святыню"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Пограничный камень"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Править Пограничный камень"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Досуг"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Править Аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Игровая площадка"
@@ -19468,35 +19798,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Править Игровую площадку"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Рыбалка"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Править Место для рыбалки"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Спортивные учреждения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Править Стадион"
@@ -19510,6 +19840,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "вид спорта:"
@@ -19901,30 +20231,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "спорт"
@@ -19934,227 +20264,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Править спортивный центр"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Спортивное поле"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Править спортивное поле"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Трек"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Править трек"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Править Поле для гольфа"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Минигольф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Править Минигольф"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Несколько"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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"
@@ -20191,203 +20574,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "10штырьковый"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Править Кегельбан"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Править Атлетику"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Стрельба из лука"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Править Стрельбу из лука"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Скалолазанье"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Править Скалолазанье"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Каноэ"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Править Каноэ"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Править Велоспорт"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Править Собачьи бега"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Наездник"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Править Наездника"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Править Гимнастику"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Моторные виды спорта"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Править моторные виды спорта"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Фигурное катание"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Править Фигурное катание"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Править Скейтборд"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Плавание"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Править Плавание"
@@ -20395,56 +20778,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Править Лыжный сопрт"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Тип лыжня"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "спуск"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "снежный городок"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Сложность"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "новичок"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "лёгкий"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "Промежуточный"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "улучшенный"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "эксперт"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "свободный"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Стрельба"
@@ -20452,182 +20835,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Править Тир"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Править Футбол"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Американский футбол"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Править Американский футбол"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Править Австралийский футбол"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Править Бейсбол"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Править Баскетбол"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Править Гольф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Рубин"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Править Бочче"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Стадион"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Править Боулз"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Править Крикет"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Крикет сети"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Править Крикет сети"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Править Крокет"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Хоккей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Править Хоккей"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Править Пелота"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Ракетка"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Править Ракетка"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Регби"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Править рэгби"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Править Настольный теннис"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Править Теннис"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Рукотворное"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Здания"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Здание"
@@ -20635,5 +21018,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -20641,10 +21024,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Править Общественное здание"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Муниципалитет"
@@ -20652,10 +21035,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Править здание муниципалитета"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Посольство"
@@ -20663,10 +21046,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Править посольство"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Здание суда"
@@ -20675,10 +21058,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Править здание суда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Тюрьма"
@@ -20687,10 +21070,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Править Тюрьму"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -20700,10 +21083,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Править Полицию"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -20712,10 +21095,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Править Пожарное депо"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -20723,5 +21106,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Править Почтовое отделение"
@@ -20729,15 +21112,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Править Детсад"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Школа"
@@ -20745,10 +21128,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Править Школу"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Университет"
@@ -20756,10 +21139,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Править Университет"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Колледж"
@@ -20767,5 +21150,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Править Колледж"
@@ -20773,5 +21156,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -20780,10 +21163,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Править Кинотеатр"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Библиотека"
@@ -20792,9 +21175,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Править Библиотеку"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -20802,10 +21185,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Править центр искусств"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Театр"
@@ -20814,10 +21197,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Править Театр"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Место поклонения"
@@ -20827,5 +21210,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Править Место поклонения"
@@ -20834,6 +21217,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Религия"
@@ -20842,66 +21225,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "Буддизм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "Христианство"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "Индуизм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "Джайнизм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "Иудаизм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "Мусульманство"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "сикхизм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "Спиритуализм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "Даосизм"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "унитарный"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Конфессия"
@@ -20910,81 +21293,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "Англиканская"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "Баптизм"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "Католическая"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "Евангельская"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "Свидетели Иеговы"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "Методизм"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "Мормон"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "пятидесятник"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "пресвитерианин"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "Протестантизм"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "квакер"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "шиизм"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "суннизм"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Адреса"
@@ -20993,5 +21376,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Править адреса"
@@ -20999,5 +21382,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Номер дома"
@@ -21005,20 +21388,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Название дома"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Название города"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Почтовый индекс"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Код страны"
@@ -21027,5 +21410,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Править интерполяцию адресов"
@@ -21033,61 +21416,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Схема нумерации"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "нечётные"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "чётные"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "алфавитный"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Цеха"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Править Чеха"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Башня"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Править Башню"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Тип вышки"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "связная"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "наблюдательная"
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Высота (в метрах)"
@@ -21095,25 +21478,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Править Водонапорную башню"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Править Газгольдер"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -21121,10 +21504,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Править Маяк"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -21132,10 +21515,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Править Ветряную мельницу"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -21144,37 +21527,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Править Трубопровод"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "нефтяная"
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "канализационная"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "для нагрева воды"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "любого назначения"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "подводная"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "надземная"
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -21184,10 +21567,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Править Очистные сооружения"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Кран"
@@ -21195,10 +21578,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Править Кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Буй"
@@ -21206,10 +21589,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Править Буй"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Точка наблюдений"
@@ -21217,10 +21600,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Править точку наблюдений"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -21228,5 +21611,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Править Видеонаблюдение"
@@ -21234,5 +21617,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Электростанция"
@@ -21242,35 +21625,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Править Электростанцию"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "энергия ветра"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "энергия воды"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "энергия сгорания топлива"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "атомный"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "уголь"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "энергия солнца"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Электроподстанция"
@@ -21279,10 +21662,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Править электроподстанцию"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Трансформаторная будка"
@@ -21291,5 +21674,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Править трансформатор"
@@ -21297,10 +21680,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "электролиния"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
@@ -21311,23 +21694,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Править Опору ЛЭП"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr "вышка"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr "столб"
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr "Ссылка вышки"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Линия электропередач"
@@ -21336,75 +21719,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Править линию электропередач"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr "Тип линии"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr "линия"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr "minor_line"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Напряжение"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr "Напряжение на кабелях"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr "одножильный"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr "двухжильный"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr "трёхжильный"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr "четырёхжильный"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Туалеты"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Примечание"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Телефон"
@@ -21413,5 +21796,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Править телефон"
@@ -21419,5 +21802,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Монеты"
@@ -21425,5 +21808,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Банкноты"
@@ -21431,5 +21814,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
@@ -21437,5 +21820,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Дебитные карты"
@@ -21443,15 +21826,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Переработка отходов"
@@ -21460,5 +21843,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Править переработку отходов"
@@ -21466,35 +21849,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Батарейки"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Консервные банки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Одежда"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Скамейка"
@@ -21503,31 +21886,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr "Кресло"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr "камень"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr "пластик"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr "Цвет"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr "чёрный"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr "коричневый"
@@ -21598,40 +21981,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "зеленый"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr "красный"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr "синий"
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "трава"
-
-#: build/trans_presets.java:2470
+msgstr "серый"
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr "белый"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr "Крепление сидений"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Охотничий стенд"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Править охотничий стенд"
@@ -21640,30 +22022,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "низкий"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "средний"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "полный"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Укрытие"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Заблокирован"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Фонтан"
@@ -21672,10 +22054,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Править фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -21684,10 +22066,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Править Источник воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Детская комната"
@@ -21695,33 +22077,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Править Детскую комнату"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Магазины"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Править Супермаркет"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr "Аптека"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr "Править Аптеку"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Продуктовый магазин"
@@ -21729,9 +22111,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Править продуктовый магазин"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Киоск"
@@ -21739,27 +22121,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Править Киоск"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr "Книжный магазин"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr "Править книжный магазин"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "Туристическое агенство"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "Править Турбюро"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Торговый автомат"
@@ -21767,5 +22149,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Править торговый автомат"
@@ -21773,88 +22155,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Реализуемая продукция"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "билеты на общественный транспорт"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "план общественного транспорта"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "билеты на парковку"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "еда"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "сладости"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "газеты"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "игрушки"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "телефонные ваучеры"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "ваучеры"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "презервативы"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "тампоны"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "пакеты для экскрементов"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "Счета или карты лояльности"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Мясная лавка"
@@ -21862,9 +22244,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Править Мясную лавку"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Булочная"
@@ -21872,9 +22254,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Править Булочную"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Флорист"
@@ -21882,18 +22264,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Править Цветочный магазин"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Цветочный"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Править Зоотовары"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Алкоголь"
@@ -21901,54 +22283,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Править Магазин алкогольной продукции"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Править Магазин напитков"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Компьютер"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Править Магазин компьютеров"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Электроника"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Редактиновать Магазан электрнонной техники"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Звуковая аппаратура"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Править Магазин звуковой аппаратуры"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Мебельный"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Править мебельный магазин"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Садовый магазин"
@@ -21956,9 +22338,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Править Садовый магазин"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Оборудование"
@@ -21966,9 +22348,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Править Магазин оборудования"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Строительный магазин"
@@ -21976,54 +22358,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Править строительный магазин"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Канцтовары"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Править Магазин канцтоваров"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Парикмахерская"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Править парихмахерскую"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Обувь"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Править Обувной магазин"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Игрушки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Править Магазин игрушек"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Видео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Править Магазин видеозаписей"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Химчистка"
@@ -22031,9 +22413,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Править Химчистку"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Прачечная"
@@ -22041,9 +22423,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Править Прачечную"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Товары для активного отдыха"
@@ -22051,28 +22433,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Править магазин товаров для активного отдыха"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Править Спортивный магазин"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Оптик"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Править оптику"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Наличные"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Банк"
@@ -22080,14 +22462,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Править Банк"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Обмен валют"
@@ -22095,5 +22477,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Править Обмен валют"
@@ -22101,15 +22483,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Править Банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Здоровье"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Врач"
@@ -22117,18 +22499,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Править врача"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Править стоматологию"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -22136,5 +22518,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Править Аптеку"
@@ -22142,9 +22524,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Отпуск лекарств по рецептам"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Больница"
@@ -22152,10 +22534,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Править Больницу"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Пункт вызова экстренной помощи"
@@ -22164,5 +22546,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Править Пункт вызова экстренной помощи"
@@ -22171,20 +22553,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Название точки"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Номер телефона"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, например: +7-916-0857403)"
@@ -22192,5 +22574,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -22199,59 +22581,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Править ветеринара"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr "География"
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Места"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Править континент"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Страна"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Править Страну"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Штат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Править Штат"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Область"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Править Область"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Графство"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Править Графство"
@@ -22259,15 +22646,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Город (более 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Править Город"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Город (до 100 000)"
@@ -22275,10 +22662,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Править город"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Пригород"
@@ -22286,25 +22673,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Править Пригород"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Править Село"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Деревня"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Править деревню"
@@ -22312,5 +22699,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Местность"
@@ -22318,10 +22705,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Править Местность"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Остров"
@@ -22329,10 +22716,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Править Остров"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr "Островок"
@@ -22340,5 +22727,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr "Править Островок"
@@ -22346,5 +22733,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
@@ -22352,10 +22739,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Править Вход в пещеру"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Вершина"
@@ -22363,10 +22750,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Править Вершину"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Ледник"
@@ -22374,10 +22761,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Править Ледник"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Вулкан"
@@ -22385,70 +22772,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Править Вулкан"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Границы"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Государственная"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Править Государственную границу"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Административная"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Править Административную границу"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Гражданская"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Править Гражданскую границу"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Политическая"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Править Политическую границу"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Национальный парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Править национальный парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Дерево"
@@ -22457,15 +22844,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Править дерево"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Научное название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Лесистая местность"
@@ -22474,5 +22861,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Править лесистую местность"
@@ -22480,17 +22867,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "Хвойный"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "Смешанный"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Лес"
@@ -22499,14 +22886,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Править Лес"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Править Заповедник"
@@ -22514,25 +22901,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Каменистая осыпь"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Править Каменистую осыпь"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Кустарник"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Править Кустарник"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Вырубленный лес"
@@ -22540,10 +22927,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Править Вырубленный лес"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Пустошь"
@@ -22551,5 +22938,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Править Пустырь"
@@ -22557,5 +22944,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -22564,45 +22951,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Править Двор фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Обрабатываемая земля"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Править обрабатываемую землю"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Луг"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Править Луг"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Править Виноградник"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Огороды"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Править Сады-огороды"
@@ -22610,25 +22997,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Сад"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Править Сад"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Трава"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Править Лужайку"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Село"
@@ -22636,10 +23023,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Править Село"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Общее"
@@ -22647,20 +23034,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Править Общественные земли"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Править Парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Спортплощадка"
@@ -22668,5 +23055,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Править Спортплощадку"
@@ -22674,15 +23061,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Править Жилую зону"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Церковное кладбище"
@@ -22690,9 +23077,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Править церковное кладбище"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -22700,39 +23087,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Править Кладбище"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Править розничную торговлю"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Коммерция"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Править Офисный район"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Промышленность"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Править Промышленный район"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Территории железных дорог"
@@ -22740,15 +23127,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Править Территорию железных дорог"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Военное"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Править Военную зону"
@@ -22756,55 +23143,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Стройплощадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Править Стройплощадку"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Пустырь с развалинами"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Править пустырь с развалинами"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Пустырь"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Править пустырь"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Править свалку"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Править карьер"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Область с вложениями"
@@ -22814,5 +23201,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Править область с вложениями"
@@ -22821,10 +23208,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "внешний сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "внутренний сегмент"
@@ -22832,5 +23219,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
@@ -22839,5 +23226,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Править ограничение на поворот"
@@ -22845,34 +23232,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Ограничение"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "поворот налево запрещён"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "поворот направо запрещён"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "движение прямо запрещено"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "разворот запрещён"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "движение только направо"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "движение только налево"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "движение только прямо"
@@ -22881,15 +23268,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "от линии"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "через точку или линию"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "до линии"
@@ -22897,5 +23284,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Маршрут"
@@ -22904,5 +23291,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Править маршрут"
@@ -22910,5 +23297,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Тип маршрута"
@@ -22980,5 +23367,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22987,17 +23374,17 @@
 msgstr "велосипедный"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "автобусный"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "трасса"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "паромный"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "лыжный"
@@ -23050,5 +23437,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -23057,13 +23444,13 @@
 msgstr "пеший"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "туристический"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "трамвайный"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "объездной"
@@ -23077,10 +23464,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "линия метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Описание символа"
@@ -23088,31 +23475,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Сеть"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr "Состояние маршрута"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "планируемый"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "альтернативный"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "временный"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "соединяющий"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Цвет (hex)"
@@ -23121,30 +23508,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "сегмент маршрута"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "сегмент вперёд"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "конечная точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "конечная вперёд"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "конечная назад"
@@ -23582,11 +23969,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "уменьшать"
@@ -25610,5 +25997,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "прозрачная_вода"
@@ -26280,4 +26667,12 @@
 #.
 #. <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"/>
@@ -26302,5 +26697,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "исторический"
@@ -26314,5 +26709,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "карьер"
@@ -26326,5 +26721,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "мусорная свалка"
@@ -26346,5 +26741,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "водоём"
@@ -26358,5 +26753,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "лес"
@@ -26370,5 +26765,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "двор фермы"
@@ -26391,5 +26786,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "розничная продажа"
@@ -26403,5 +26798,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "промышленный"
@@ -26415,5 +26810,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "заброшенная застройка"
@@ -26427,5 +26822,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "участок для застройки"
@@ -26439,5 +26834,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "жд разъезд"
@@ -26494,7 +26889,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "военный"
@@ -26508,5 +26903,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "кладбище"
@@ -26519,5 +26914,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "пик"
@@ -26532,5 +26927,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "ледник"
@@ -26544,5 +26939,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "вулкан"
@@ -26597,8 +26992,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "природный"
@@ -26612,5 +27007,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "кустарник"
@@ -26624,5 +27019,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "здоровье"
@@ -26636,8 +27031,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "область"
+msgstr "woodarea"
 
 #. color water
@@ -26649,5 +27043,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "грязь"
@@ -26661,5 +27055,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "пляж"
@@ -26737,8 +27131,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "маршрут"
@@ -26786,7 +27180,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "граница"
@@ -26936,11 +27330,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "место"
@@ -26988,6 +27382,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "адрес"
@@ -27296,44 +27690,109 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Ошибка при загрузке страницы {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgid "File could not be found."
+#~ msgstr "Файл не найден"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Выберите хотя бы один тип данных для скачивания."
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Ошибка загрузки в OSM API"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Конфликтующее отношение"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
 #~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её на <A HREF=\"{0}\">английском</"
-#~ "A>."
+#~ "<html>Выделенный объект \"{0}\" используется в отношении \"{1}\" в роли "
+#~ "{2}.<br>Удалить из отношения?</html>"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
 #~ msgstr ""
-#~ "Страница справки отсутствует. Создайте её на <A HREF=\"{0}\"> английском "
-#~ "</A> или <A HREF=\"{1}\">вашем языке</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Возможно только редактирование справочных страниц JOSM Online Help"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Использовать шаблон ''{0}''"
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "Задать группу ''{0}'' в группе ''{1}''"
+#~ "<html>Выделенный объект \"{0}\" используется в отношении \"{1}\"."
+#~ "<br>Удалить из отношения?</html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Ошибка разбора"
+
+#~ msgid "File not found"
+#~ msgstr "Файл не найден"
+
+#~ msgid "Replace"
+#~ msgstr "Заменить"
+
+#~ msgid "Replace the way this member refers to with the combined way"
+#~ msgstr "Заменить линию этим участником, связанным с объединённой линией"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Пожалуйста, введите сначала желаемые координаты"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Сначала выберите закладку"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Задайте строку для поиска"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Не удается получить результаты поиска"
+
+#~ msgid "name"
+#~ msgstr "название"
+
+#~ msgid "zoom"
+#~ msgstr "масштаб"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Копировать умолчания"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Пожалуйста, выберите ряд для копирования."
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr ""
+#~ "Источник XML (URL-ссылка или имя файла) для заданных файлов в кол-ве {0} "
+#~ "шт.."
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Добавить новый XML источник к списку."
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr ""
+#~ "Значения по умолчанию (Смотрите подсказки, чтобы узнать больше об этом)"
 
 #~ msgid ""
-#~ "Plugin {0} version {1} found but for this version of JOSM is at least "
-#~ "version {2} required. Please update the plugin."
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "Найден модуль {0} версии {1} но для этой версии JOSM требуется, модуль по "
-#~ "крайней мере версии {2}. Пожалуйста, обновите модуль."
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ "(Можно указать, с каким промежутком в днях будет появляться<br>данное "
+#~ "предупреждение, установив параметр настроек 'pluginmanager.warntime'.)"
+
+#~ msgid ""
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
 #~ msgstr ""
-#~ "Установить вручную Ламберт зоны (например, для места между двумя зонами)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Открыть сначала слой (GPX, OSM, кэш)"
+#~ "Предупреждение: Не удалось восстановить геометрию окна из ключа ''{0}''. "
+#~ "Геометрия приведена к состоянию по умолчанию. Детали: {1}"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Показать статус квадрата карты"
+
+#~ msgid "Request Update"
+#~ msgstr "Запросить обновление"
+
+#~ msgid "error loading metadata"
+#~ msgstr "ошибка загрузки метаданных"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "ошибка запроса обновления: уровень масштабирования не 12"
+
+#~ msgid "requested: {0}"
+#~ msgstr "предлагается: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "ошибка при запросе обновления"
 
 #~ msgid "No data imported."
@@ -27354,7 +27813,4 @@
 #~ msgid "Unknown version"
 #~ msgstr "Неизвестная версия"
-
-#~ msgid "Aborting..."
-#~ msgstr "Прерывание..."
 
 #~ msgid "position"
@@ -27389,4 +27845,7 @@
 #~ msgstr "Все линии были пустыми"
 
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Ошибка при загрузке страницы {0}"
+
 #~ msgid "Open in Browser"
 #~ msgstr "Открыть в браузере"
@@ -27473,4 +27932,10 @@
 #~ msgid "Occupied By"
 #~ msgstr "Объект"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Использовать шаблон ''{0}''"
 
 #~ msgid ""
@@ -27657,4 +28122,7 @@
 #~ msgstr "Проверить выделенное, либо все загруженные данные"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Возможно только редактирование справочных страниц JOSM Online Help"
+
 #~ msgid "Authors: {0}"
 #~ msgstr "Авторы: {0}"
@@ -27818,4 +28286,11 @@
 #~ "Пропуск линии потому, что она включает в себя узлы, которые не "
 #~ "существуют: {0}\n"
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr ""
+#~ "Установить вручную Ламберт зоны (например, для места между двумя зонами)"
+
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Открыть сначала слой (GPX, OSM, кэш)"
 
 #~ msgid "Remove route nodes"
@@ -28013,7 +28488,4 @@
 #~ "html>"
 
-#~ msgid "Keep mine"
-#~ msgstr "Сохранить мои"
-
 #~ msgid "nodes"
 #~ msgstr "точки"
@@ -28098,7 +28570,4 @@
 #~ "продолжить?"
 
-#~ msgid "There is currently no changeset open."
-#~ msgstr "В данный момент нет открытого пакета изменений"
-
 #~ msgid "Close current changeset"
 #~ msgstr "Закрыть текущий пакет изменений"
@@ -28146,4 +28615,16 @@
 #~ msgid "Empty member in relation."
 #~ msgstr "В отношении имеется пустой участник."
+
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Страница справки отсутствует. Создайте её на <A HREF=\"{0}\">английском</"
+#~ "A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Страница справки отсутствует. Создайте её на <A HREF=\"{0}\"> английском "
+#~ "</A> или <A HREF=\"{1}\">вашем языке</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -28228,4 +28709,7 @@
 #~ msgid "Processing {0}"
 #~ msgstr "Обработка {0}"
+
+#~ msgid "Preset group ''{0}'' of group ''{1}''"
+#~ msgstr "Задать группу ''{0}'' в группе ''{1}''"
 
 #~ msgid "Relation: from {0} to {1} via {2}"
@@ -28260,2 +28744,9 @@
 #~ msgid "latitude"
 #~ msgstr "широта"
+
+#~ msgid ""
+#~ "Plugin {0} version {1} found but for this version of JOSM is at least "
+#~ "version {2} required. Please update the plugin."
+#~ msgstr ""
+#~ "Найден модуль {0} версии {1} но для этой версии JOSM требуется, модуль по "
+#~ "крайней мере версии {2}. Пожалуйста, обновите модуль."
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 18273)
+++ applications/editors/josm/i18n/po/sk.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-21 09:10+0000\n"
-"Last-Translator: kayle.sk <webmaster@kayle.sk>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-07 18:37+0000\n"
+"Last-Translator: Martin Petricek <singularita@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Vytváram hlavné grafické rozhranie ( GUI )"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Nápoveda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorujem nesprávnu URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Upozornenie"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorujem poškodený súbor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Nemôžem čítať súbor ''{0}''.<br> Chyba je: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Chyba"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "NEZNÁMA"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "O programe"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Zobraziť obrazovku \"O Aplikácii\""
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editor"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Verzia {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Posledná zmena {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java verzia {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Domovská stránka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Správy o chybách"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Informácie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Informačné súbory"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revízia"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Príspevok"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licencia"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Pluginy"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "O programe JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Súbor nie je možné nájsť."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -316,4 +299,6 @@
 "screen with browser windows<br>and take some time to finish."
 msgstr ""
+"Asi ste spustili {0} okná(ien) prehliadača.<br>Toto môže zaplniť vašu "
+"obrazovku s oknom prehliadača<br>a spôsobiť ukončenie po nejakej dobe."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87
@@ -323,42 +308,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -366,5 +350,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -377,19 +361,19 @@
 msgstr "Prosím vybrať aspoň jeden už nahraný bod, cestu, alebo reláciu."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Prosím vyberte cieľovú vrstvu."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Výber cieľovej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Zlúčiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -400,50 +384,50 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Žiadne cieľové vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Pridať bod..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Pridať bod zadaním zemepisnej šírky a dĺžky."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Úpravy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Zadajte súradnice nového bodu."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Použite desatinné stupne."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Záporné hodnoty znamenajú západnú, resp. južnú pologuľu."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -452,5 +436,5 @@
 msgstr "Zemepisná šírka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -459,27 +443,27 @@
 msgstr "Zemepisná dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Zarovnať body do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Presunúť označené body do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -489,5 +473,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -503,30 +487,28 @@
 msgstr "Nástroj: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Vyberte minimálne 4 body"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -536,84 +518,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Zarovnať body na priamku"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Presunúť označené body na priamku"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Vyberte prosím aspoň 3 body."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "údaje"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "výber"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "stiahnuté"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Priblížiť na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Priblížiť pohľad na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Zobrazenie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 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:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Nie je žiadny konflikt, čo by sa mohol priblížiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Zatvoriť otvorený súbor zmien"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Zatvárajú sa otvorené súbory zmien"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -621,37 +603,37 @@
 msgstr "Súbor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Niesú tam otvorené súbory zmien"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Neotvorené súbory zmien"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Sťahujem otvorené súbory zmien"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Spojiť cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Spojiť niekoľko ciet do jednej."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Zmeniť smer?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Otočiť a Spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -661,5 +643,5 @@
 "ciest?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -667,41 +649,41 @@
 msgstr "Nemôžem spojiť cesty (Nemôžu byť spojené do jedného reťazca bodov)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Spojiť {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Prosím, vyberte aspoň dve cesty pre spojenie."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Vybrať označené objekty pre vloženie."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Prosím zvoľ niečo pre kopírovanie"
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Vytvoriť kružnicu"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Vytvoriť kružnicu z troch vybratých bodov."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Tieto body niesú v kruhu. Prerušujem."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -711,16 +693,14 @@
 "alebo troma bodmi."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -732,5 +712,5 @@
 msgstr "Odstrániť"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Zmazať zvolené objekty."
@@ -738,6 +718,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -751,73 +731,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Rozložiť body rovnomerne"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Rozložiť zvolené body v rovnakej vzdialenosti od seba pozdĺž trasy."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Stiahnuť z OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Stiahnutie mapových údajov z OSM servera."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Stiahnuť"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Prosím zvolte aspoň jednu úlohu k stiahnutiu"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr "Sťahovanie rodičovských ciest/relácií..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Sťahovanie pôvodných odkazov do jedného vybraného pôvodného"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, fuzzy, java-format
-msgid "Id > 0 required, got {0}"
-msgstr "ID > 0 očakávané. Got {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -826,39 +783,39 @@
 msgstr "Parameter ''{0}'' nesmie byť nulový"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Boli tam {0} konflikty počas importu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Konflikty počas sťahovania"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Nahrávanie nadradených z pôvodných {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr "({0}/{1}) Nahrávam rodičovské z bodov {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Nahrávanie nadradených z pôvodných {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr "({0}/{1}) Nahrávam rodičovské z cesty {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Nahrávanie nadradených z pôvodných {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr "({0}/{1}) Nahrávam rodičovské z relácie {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplikovať"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplikovať výber kopírovaním a vložením."
@@ -868,41 +825,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Koniec"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Ukončť program."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Všetky formáty"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Exportovať do GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exportovať dáta do GPX súboru."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Nie je nič na exportovanie. Najskôr stiahnite dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -941,6 +898,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -959,9 +916,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -981,5 +938,5 @@
 msgstr "parameter ''{0}'' nesmie byť nulový"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -987,36 +944,36 @@
 msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Export GPX súboru"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
 msgstr "História objektu"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Zobraziť históriu o OSM cestách, bodoch, alebo relácií."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Info o Elemente"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Vložiť bod do cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Pripojiť bod k najbližšej ceste"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Spojiť body a línie"
@@ -1026,169 +983,187 @@
 msgstr "Bez skratky"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Zlúčiť vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Zlúčiť aktuálnu vrstvu do inej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Zlúčiť body"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Zlúčiť body do najstaršieho bodu"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Zvoľte minimálne dva body pre zlúčenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Prerušujem..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Nemôžem zlúčiť body: Zmazala by sa tak cesta, ktorá je stále používaná."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Zlúčiť {0} body"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Zlúčiť výber"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Zlúčiť aktuálne vybrané pôvodné do inej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Zrkadlo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Zrkadlovo vybrané body a cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Prosím vyberte aspoň jeden bod, alebo cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "hore"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Presunúť objekty {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "dole"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "vľavo"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "vpravo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Presunúť {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Presunutie objektov {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Nemôžem presúvať objekty mimo svet."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Nový"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Vytvoriť novú mapu"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Otvoriť..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Otvoriť súbor."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Otváranie súborov"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Otváranie súboru ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Otvoriť umiestnenie..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Otvoriť z URL."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Oddeliť vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr "Vyberte ak dáta majú byť stiahnuté na novú vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Vložte URL pre sťahovanie:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr "Vložte adresu URL z ktorej budú dáta sťahované"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Priečinok sťahovania"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Sťahovacia URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr "Začiatok sťahovania dát"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr "Zavrieť dialóg a zrušiť sťahovanie"
 
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Sťahujem dáta"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Pravouhlý tvar"
@@ -1198,18 +1173,18 @@
 msgstr "Posunúť body tak, že všetky úhly sú 90 alebo 270 stupňov"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 msgid "Orthogonalize Shape / Undo"
 msgstr "Pravouhlý tvar / Obnovenie(Undo)"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
 msgid "Undo orthogonalization for certain nodes"
 msgstr "Obnovenie(Undo) pravouhlosti pre určené body"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr "Pravouhlosť / Obnovenie(Undo)"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1221,9 +1196,9 @@
 "pravouhlosť!"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr "Obnovenie(Undo) Pravouhlého tvaru"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1235,36 +1210,37 @@
 "chcete odstrániť toto upozornenie.<br>Chcete pokračovať?</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr "Využitie"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Vybrané prvky nemôžu byť zpravouhlené"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Pravouhlosť"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Vložiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Vložiť zo schránky"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Vložiť vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Použiť značky objektov v schránke na všetky zvolené objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1274,5 +1250,5 @@
 msgstr[2] "Vkladanie {0} značiek"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1282,59 +1258,59 @@
 msgstr[2] "až {0} pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Nastavenia..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Otvoriť globálne nastavenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Opakovať"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Zopakuje poslednú zrušenú akciu."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Premenovať vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Tiež premenovať súbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Nemôžem premenovať súbor ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Otočiť smer ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Otočiť smer všetkých zvolených ciest."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Zvoľte minimálne jednu cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Otočiť smer ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1342,10 +1318,10 @@
 msgstr "Uložiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Uložiť aktuálne dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1396,21 +1372,21 @@
 msgstr "Uložiť vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Uložiť aktuálne údaje do nového súboru."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Vybrať všetko"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1420,10 +1396,10 @@
 "neúplné objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Zobraziť správu o stave"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
@@ -1431,19 +1407,19 @@
 "chybám"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Pomoc: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Správa o stave"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Kopírovať do schránky a zavrieť"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1452,18 +1428,18 @@
 msgstr "Zavrieť"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Rozdeliť cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Rozdeliť cestu vo zvolenom bode"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Tento výber nemôže byť použitý k rozdeleniu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1472,5 +1448,5 @@
 msgstr[2] "Vybraté body nie sú v strede cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1489,9 +1465,9 @@
 "vyberte tiež cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Zvolené body nezdieľajú rovnakú cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1500,10 +1476,10 @@
 msgstr[2] "Označená cesta neobsahuje všetky vybraté body."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musíte zvoliť minimálne dva body pre rozdelenie uzavretej cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1535,61 +1511,61 @@
 msgstr "Rozdeliť cestu {0} do {1} častí"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Zapnúť GPX čiary"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Kresliť spojnice medzi GPS bodmi"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Zapnúť/Vypnúť globálne nastavenie ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Rozpojiť cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Zduplikovať body používané viacerými cestami."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Tento bod nie je prilepený k ničomu inému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Žiaden z týchto bodov nie je prilepený k ničomu inému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Žiadna z týchto ciest nie je prilepená k ničomu inému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Tento výber sa nedá použiť pre oddelenie bodov"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Vyberte buď:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Jeden označený bod, alebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Jeden bod používaný viac než jednou cestou, alebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1598,5 +1574,5 @@
 "ceste, alebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1605,5 +1581,5 @@
 "ceste."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1616,9 +1592,9 @@
 "svoje vlastné kópie a všetky bodybudú vybraté."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Nepripojený bod (Unglued Node)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1626,80 +1602,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Duplikovať body {0} do {1} bodov"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Späť"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Vrátiť poslednú akciu."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Odznačiť všetko"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Odznačiť všetky objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Odznačiť všetko (Focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Odznačiť všetko (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr "Aktualizácia dát"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
 msgstr "Aktualizovať objekty v aktuálnej dátovej vrstvy zo servera."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Aktualizujem dáta"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr "Sťahujem dáta"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Nájdená neaktuálna dátová sada"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr "Nemôže byť nájdený objekt s id {0} v aktuálnej dátovej sade"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr "Aktualizovať výbery"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr "Aktualizovať aktuálne vybraté objekty zo servera (znovu nahrať dáta)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Aktualizácia výberu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Nie sú tam vybrané pôvodné pre aktualizáciu."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Výber je prázdny"
@@ -1711,8 +1688,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
+#, fuzzy
+msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "Nahrať všetky zmeny v aktuálnej dátovej vrstve na OSM server"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1723,5 +1701,5 @@
 "vyriešte.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1729,29 +1707,29 @@
 msgstr "Žiadne zmeny pre uloženie."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr "Synchronizovať iba {0} bod"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr "Synchronizovať iba {0} cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr "Synchronizovať iba {0} reláciu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Synchronizovať celú dátovú sadu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1772,11 +1750,11 @@
 "zrušenie a pokračovanie v editácii.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr "Objavené konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1791,5 +1769,5 @@
 "<strong>{1}</strong> pre zrušenie a pokračovanie v editácii.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1802,24 +1780,22 @@
 "existujúcim zmenovým súborom.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr "Zmenový súbor zavretý"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Zrušiť rozhodnutie konfliktu"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr "Pripravujem rozhodnutie konfliktov"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
-#, fuzzy
+msgstr "Kľuknutím stiahnete všetky rodičovské cesty pre body {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
-msgstr "Zavrieť tento dialóg a pokračovať v editácii v JOSMe"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+msgstr "Kľuknutím zrušíte a pokračujete v editovaní mapy"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1829,51 +1805,63 @@
 "conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+"<html>Nahrávanie <strong>neúspešné</strong> pretože sa snažíte zmazať bod "
+"{0} ktorý je stále použitý v ceste {1}.<br><br>Kľuk <strong>{2}</strong> pre "
+"stiahnutie všetky rodičovské cesty pre bod {0}.<br>Ak nevyhnutne JOSM bude "
+"chcieť vytvoriť konflikty ktoré môžete rozhodnúť v the Conflict Resolution "
+"Dialog.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+msgstr "Bod je stále v užívaní"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
-"Varovanie: chybné záhlavie \"{0}\" nie je zhoda  s očakávanou schémou \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Upload <strong>zlyhal</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Nahrávanie na OSM API neúspešné"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+"Varovanie: chybná hlavička \"{0}\" nenastala žiadna zhoda s očakávaným vzorom"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Aktualizácia pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr "Náhrávanie dát do vrstvy ''{0}''"
+msgstr "Náhrávanie dát na server z vrstvy ''{0}''"
 
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, fuzzy, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
 msgstr ""
 "Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto "
 "pôvodných a zopakovanie nahratia."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, fuzzy, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+"Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto "
+"pôvodných a zopakovanie nahratia."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Nahrávam dáta ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, fuzzy, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr "Nahrať výber"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr "Nahrať všetky zmeny v aktuálnom výbere na OSM server."
@@ -1892,11 +1880,11 @@
 msgstr "Kontrola pre zmazané rodičovské v lokálnej dátovej sade"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Priblížiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Oddialiť"
@@ -1976,21 +1964,17 @@
 msgstr "Spomalené prehrávanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Sťahujem GPS dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Stiahnuté GPX dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Nekomprimované (Raw) GPS dáta"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Sťahujem dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1998,27 +1982,42 @@
 msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr "V tejto oblasti sa nenachádzajú žiadne dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "údaje OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Stiahnuté {0} z {1} (zostáva stiahnuť {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr "Nastedujúca chyba nastala počas masového sťahovania:{0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Chyby v priebehu sťahovania"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Aktualizujem dáta"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "viditeľné (na servery)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+#, fuzzy
+msgid ""
+"Click to check whether objects in your local dataset are deleted on the "
+"server"
+msgstr ""
+"{0} objekt bol očistený z lokálneho dátového súboru, pretože je zmazaný na "
+"servery."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignorovať"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "Kľuknutím zrušíte a pokračujete v editovaní mapy"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2035,7 +2034,22 @@
 "servery.<br>Click <strong>{2}</strong>ignorovať.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Vymazané alebo presunuté pôvodné"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Nastedujúca chyba nastala počas masového sťahovania:{0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Chyby v priebehu sťahovania"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Chyby v priebehu sťahovania"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2057,5 +2071,5 @@
 msgstr "Režim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2085,38 +2099,38 @@
 msgstr "zvolené"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Pridať bod do cesty a spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Vytvoriť nový bod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Zvoliť bod pod kurzorom."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2126,14 +2140,14 @@
 msgstr[2] "Vložiť nový bod do {0} ciest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 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:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Pokračovanie cesty z posledného bodu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Koniec kreslenia."
@@ -2153,5 +2167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku."
@@ -2163,5 +2177,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Pustite tlačítko myši k zastaveniu otáčania"
@@ -2226,5 +2240,5 @@
 msgstr "Vždy posúvať a nezobrazovať znovu dialóg"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2232,5 +2246,5 @@
 "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2242,4 +2256,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zväčšenie"
@@ -2259,5 +2274,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Vyhľadávať..."
@@ -2362,25 +2376,32 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - objekt s pridanými číslami bodov"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - všetky zmenené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - všetky vybraté objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - všetky nekompletné objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - všetky neoznačené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>dieťa <i>výraz</i></b> - všetky deti objektov vyhovujúcich výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2388,17 +2409,17 @@
 "<b>rodič <i>výraz</i></b> - všetci rodičia objektov vyhovujúcich výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Použite <b>|</b> alebo <b>OR</b> pri kombinácii s logickým \"alebo\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Použite <b>\"</b> ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Použite <b>(</b> a <b>)</b> k zoskupeniu výrazov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2408,51 +2429,51 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr "Predložiť filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Začať vyhľadávanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Neboli nájdené záznamy pre \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nič nebolo pridané do výberu hľadaním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nič nebolo odstránené z výberu hľadaním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Nič sa nenašlo vo výbere vyhľadávania pre ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Najdených {0} zodpovedajúcich výrazov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2486,26 +2507,40 @@
 "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Neočakávaná značka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Chýbajúci argument pre \"alebo\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Chýbajúci argument pre \"NOT\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Očakávam uzatváraciu zátvorku."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Zlé číslo parametrov pre operátor bodov."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"Nesprávna hodnota operátora bodov: {0}. Operátor bodov čaká čísla bodov, "
+"alebo rozsah bodov, napr. body:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Zlé číslo parametrov pre operátor bodov."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2516,5 +2551,5 @@
 "alebo rozsah bodov, napr. body:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2618,4 +2653,20 @@
 msgstr "Cyklické závislosti"
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2633,8 +2684,8 @@
 msgstr "Pridať reláciu {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Očistené {0} objekty"
+msgstr "Preidaných {0} objektov"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2718,5 +2769,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr "Dvojitý konflikt"
@@ -2756,4 +2807,15 @@
 msgstr "nemôžem vyriešiť nerozhodnutý konflikt"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parameter ''{0}'' nemôže byť prázdny"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2788,32 +2850,6 @@
 msgstr[2] "Zmazať {0} relácií"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Konfliktné vzťahy (relation)"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Zmazať z relácie (zo vzťahu"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-"<html>Výber \"{0}\" je použitý reláciou \"{1}\" s úlohou {2}.<br>Zmazať z "
-"relácie?</html>"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-"<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</html>"
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Rozdeliť segment cesty"
@@ -2821,6 +2857,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2832,5 +2868,5 @@
 "<br>Naozaj ich chcete zmazať?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr "Odstrániť potvrdenie"
@@ -3020,15 +3056,30 @@
 msgstr "Automatická úprava značiek (tag)"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Východzia hodnota je''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Poškodený konfiguračný súbor pri linke {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -3039,5 +3090,5 @@
 "nie je adresár."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -3048,5 +3099,5 @@
 "nie je adresár.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3057,5 +3108,5 @@
 "chýbajúceho adresára preferencií: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3066,5 +3117,5 @@
 "chýbajúceho adresára preferencií: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3074,5 +3125,5 @@
 "súboru preferencií."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3083,5 +3134,5 @@
 "súborom preferencií."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3092,5 +3143,5 @@
 "preferencií do východzieho: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3101,5 +3152,5 @@
 "súboru  <br>{0}<br> a vytváranie nového východzieho súboru.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3110,19 +3161,42 @@
 "preferencií do východzích: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Predvoľby uložené na {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Nemôžem nahrať predvoľby. Dôvod: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Nemôžem nahrať predvoľby zo servera."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3133,5 +3207,27 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, fuzzy, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+"Neúspešné nahratie záložiek z ''{0}'' pre bezpečnostné dôvody. Výnimka bola: "
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "NEZNÁMA"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3153,20 +3249,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "J"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "S"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "Z"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "V"
@@ -3178,4 +3274,18 @@
 msgid "Changeset {0}"
 msgstr "Súbor zmien {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
 #. translators notes must be in front
@@ -3242,14 +3352,14 @@
 msgstr "Varovanie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "očekávané id >= 0. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "pôvodné s id=0 nemôžu byť neviditeľné"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3257,5 +3367,5 @@
 msgstr "ID > 0 očakávané. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3284,6 +3394,6 @@
 "viacnásobnými hodnotami"
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3343,113 +3453,113 @@
 msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Cesta označená ako plocha nie je uzavretá."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Vymazaný člen ''{0}'' vo vzťahu (relation)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Cesta ''{0}'' s menej, než dvoma bodmi."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Najdená viac než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Najdené viac cieľových \"to\" ciest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Viac ako jedna \"via\" najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznáma funkcia ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámy typ člena pre ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Nenajdená cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Nenajdená cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Nie je \"via\" bod alebo cesta najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačína, ani nekončí v bode \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" bode."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Štýl pre obmedzenie {0} nenajdený."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Vnútorná(inner) cesta ''{0}'' je vonku."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Vnútorná(inner) cesta ''{0}'' je vonku."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3465,11 +3575,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "text"
+msgstr "oblasť textu"
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3488,5 +3597,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3498,5 +3606,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3527,5 +3634,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "pozadie"
@@ -3559,12 +3666,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambertova zóna (Francie)"
+msgstr "Lambert 4 Zones (Francúzko)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambertova zóna (Francie)"
+msgstr "Lambert CC9 Zone (Francúzko)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3600,10 +3705,10 @@
 msgstr "UTM20N Martinique Fort Desaix 1952"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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>Nemôžem čítať záložky z<br>''{0}''<br>Chyba bola: {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3632,5 +3737,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "železnica"
@@ -3647,4 +3752,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3662,33 +3769,33 @@
 msgstr[2] "{0} členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Predpokladaný priestupok"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr "Bezpečnostná výnimka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr "Sieťová výnimka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr "IO Výnimka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr "Vnútorná chyba servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr "Chybná požiadavka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr "Nenájdené"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3696,16 +3803,16 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Neznámy hostiteľ"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr "Objekt je vymazaný"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr "Zobraziť informácie o pomoci"
@@ -3718,4 +3825,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Sťahujem \"Správu dňa\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "Zavrieť dialógové okno"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3786,74 +3898,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Meno používateľa"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "použitie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Zobrazí túto nápovedu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Štandardný unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Stiahnuť ohraničujúcí box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Otvoriť súbor (as raw gps, if .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 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:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Výber s určeným hľadaním"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Spustiť v maximalizovanom režime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Nastaviť východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Nastaviť jazyk."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr "možnosti poskytnutia ako Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/JOSM/ZLOŽKE/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 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:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3865,9 +3977,9 @@
 "      Java nastavenie využitia na maximálnu mieru pridelenej pamäti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "príklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3878,25 +3990,25 @@
 "nejaké dáta predtým--výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Namiesto --download=<bbox> môžete zadať osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Aktivujem aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Načítavam skoršie pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Nastavujem východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Načítavam pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3909,11 +4021,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3938,6 +4050,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4040,25 +4152,22 @@
 msgstr "(žiadny objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr "Používateľ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "vrstva nie je v zozname"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Vrstva ''{0}'' musí byť v  zozname vrstiev"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Chyba pri rozkladaní"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Súbor nebol nájdený"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Nie, zrušiť operáciu"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4079,5 +4188,5 @@
 msgstr "unset: táto vlastnosť sa nedá nastaviť na vybraté objekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4085,50 +4194,49 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125
-#, fuzzy
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
 "relation</strong>.</html>"
 msgstr ""
-"<html>Verzia <strong>{0}</strong> vytvorená na <strong>{1}</strong></html>"
+"<html>Prosím potvrdiť odstránenie <strong>1 objekt</strong> z <strong>1 "
+"relácie</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
 "relations</strong>.</html>"
 msgstr ""
-"<html>Verzia <strong>{0}</strong> vytvorená na <strong>{1}</strong></html>"
+"<html>Prosím potvrdiť odstránenie <strong>1 objekt</strong> z <strong>{0} "
+"relácií</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
 "relations</strong>.</html>"
 msgstr ""
-"<html>Verzia <strong>{0}</strong> vytvorená na <strong>{1}</strong></html>"
+"<html>Prosím potvrdiť odstránenie <strong>{0} objektov</strong> z <strong>"
+"{1} relácií</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Zmazať {0} objekty"
-msgstr[1] "Zmazať {0} objekt"
-msgstr[2] "Zmazať {0} objektov"
+msgstr[0] "Vymazávam {0} objekt"
+msgstr[1] "Vymazávam {0} objekty"
+msgstr[2] "Vymazávam {0} objektov"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Zmazať {0} objekty"
+msgstr "Zmazať objekty"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "nevymazaný"
+msgstr "Na zmazanie"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Vzťah (relation)"
+msgstr "Z relácie"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4140,5 +4248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4148,9 +4256,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327
 msgid "Click to close the dialog and remove the object from the relations"
-msgstr ""
+msgstr "Kľuknutie zavrie dialóg a odstráni objekt z relácií"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340
 msgid "Click to close the dialog and to abort deleting the objects"
-msgstr ""
+msgstr "Kľuknutie zavrie dialóg a zruší vymazanie objektov"
 
 #. *
@@ -4187,5 +4295,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4202,5 +4310,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4417,8 +4525,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4747,6 +4855,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4760,6 +4868,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4817,36 +4925,36 @@
 msgstr "Ich(their) dátová sada neobsahuje značku s kľúčom {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr "Konflikty pri spojovaní pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr "Konflikty pri spojovaní ciest - spojovaná cesta je ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, fuzzy, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
 msgstr "Konflikty pri spojovaní bodov - spojovaný bod je ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr "Žiadne konflikty na rozhodnutie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
 msgstr "Zrušiť rozhodnutie konfliktu"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
 msgstr "Použiť vyriešený konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr "Použiť"
@@ -4858,5 +4966,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "všetky"
@@ -4948,4 +5056,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4957,4 +5067,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4969,49 +5080,86 @@
 msgstr "pozícia {0} je mimo rozsah. aktuálne číslo z  členov: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr "Odstrániť tohoto člena relácie z relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr "Nahradiť"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr "Nahradiť cestu s odkazom na jej člena so spojením cesty"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "Ponechať zdroj"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+#, fuzzy
+msgid "Keep this relation member for the target object"
+msgstr "Odstrániť tohoto člena relácie z relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr "Nerozhodnutý"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr "Ešte nerozhodnuté"
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr "Funkcia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Nastavenie funkcie pre vybrané členy"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+#, fuzzy
+msgid "Tag modified relations with "
 msgstr "Značka zmenená vzťahmi s   "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
 msgctxt "tag"
 msgid "Key:"
 msgstr "Kláves:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Upload <strong>zlyhal</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr "Hodnota:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr "Použiť túto funkciu pre všetkých členov"
@@ -5050,6 +5198,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5145,10 +5293,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5215,5 +5360,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5258,4 +5404,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr "Aktivovať"
@@ -5281,6 +5428,6 @@
 msgstr "Informácie o vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5290,22 +5437,22 @@
 msgstr[2] "Toto zmení až {0} objekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Prázdna hodnota zmaže klúče"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<rôzne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Zmeniť hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5315,69 +5462,73 @@
 msgstr[2] "Zmeniť vlastnosti až {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Vyberte prosím kľúč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Vyberte prosím objekty, ktorým chcete zmeniť vlastnosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členstvo(memberships)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pre zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Pridať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Upraviť vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Zmeniť reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Zmazať z relácie (zo vzťahu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naozaj zmazať výber z relacie {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Zmaže zvolený klúč vo všetkých objektoch"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Zmazať vlastnosti"
@@ -5385,40 +5536,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Otvoríť zoznam všetkých relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relácie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Otvoriť editor pre zvolenú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Zmazať vybraté relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Vytvoriť novú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr "Pridať aktuálny výber do zoznamu vybratých relácií"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Zmazať vybraté relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Vyberte buď:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Nahrať vybraté relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Stiahnuť členov"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5445,5 +5616,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5455,9 +5626,9 @@
 msgstr "Výber: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Uvoľniť panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5466,5 +5637,5 @@
 "lište."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Kľuknite pre minimalizovanie/maximalizovanie obsahu panelu"
@@ -5551,5 +5722,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr "Stiahnuť členov relácie"
@@ -5580,23 +5752,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr "Značky a Členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr "Nadradené vzťahy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr "Relácia dieťa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5608,14 +5780,14 @@
 "chcete pokračovať s kruhovou závislosťou?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr "Odstraňte ich, vyčistite reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorujte ich, nechajte reláciu tak ako je"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5628,9 +5800,9 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr "Viacnásobné členy odkazujú na rovnaké obecné"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5642,5 +5814,5 @@
 "odkazy a je preto znechutený.<br>Vynechanie relácie ''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5648,5 +5820,5 @@
 "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5654,5 +5826,5 @@
 "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5662,5 +5834,5 @@
 "členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5670,20 +5842,20 @@
 "členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor Relácií: Odstrániť Vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "Vybrať člena relácie, ktorý sa týka pôvodných v aktuálnom výbere"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5693,67 +5865,66 @@
 "Vybrať člena relácie, ktorý odkazuje na {0} pôvodných v aktuálnom výbere"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr "Výber pôvodných pre vybraté členy relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr "Triedenie členov relácie"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr "Editor Relácií: Triedenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Pridať všetky zvolené objekty medzi členy"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr "Editor Relácií: Posun Hore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Presunúť zvolenú vrstvu o riadok dolu."
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr "Editor Relácií: Posun Dole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr "Odstrániť práve vybraté členy z tejto relácie"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr "Editor Relácií: Odstrániť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr "Vymazať práve vydanú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr "Áno, vyriešiť konflikt a zavrieť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "Áno, vyriešiť konflikt a zavrieť"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr "Kľuknutie vytvorí konflikt a zatvorí editor tejto relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr "Nie, pokračovať v editácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+msgstr "Kľuknutie navráti editor relácie a pokračuje v editovaní relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5765,9 +5936,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr "Konflikt v dátach"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5778,41 +5949,41 @@
 "rozhodnite najskôr tento konflikt, potom skúste znovu.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr "Použiť súčasnú aktuálizáciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr "Použiť aktualizácie a zavrieť dialógové okno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr "Pridať prázdnu značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Stiahnuť členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr "Editor Relácií: Sťahovanie Členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr "Nastavenie funkcie pre vybrané členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr "Použiť Funkciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5825,17 +5996,17 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr "Áno, Použiť to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr "Nie, použite to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr "Potvrdiť prázdnu funkciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na"
@@ -5846,13 +6017,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr "Zväčšiť na pôvodné prvé vybraté členy odkazujúce na"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Zväčšovanie je vypnuté pretože vrstva z tejto relácie nie je aktívna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr "Zväčšovanie je vypnuté pretože nie je vybratý člen"
@@ -5866,14 +6037,14 @@
 msgstr "Spojený"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr "Sťahovanie týkajúcich sa relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr "child.getId() >0 očakávaný. Got {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5924,60 +6095,90 @@
 "Varovanie: ignorovanie výnimky pretože úloha bola zrušená. Výnimka bola: "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Nepripojený"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
-#, fuzzy
+msgstr "cesta je spojená"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr "Triedenie členov relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
-#, fuzzy
+msgstr "cesta je spojená do predchádzajúceho člena relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr "Triedenie členov relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+msgstr "cesta je spojená do nasledujúceho člena relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+"cesta nie je pripojená do predchádzajúceho alebo nasledujúceho člena relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Prosím najskôr zadajte požadované koordináty."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+#, fuzzy
+msgid "<html>There is currently no download area selected.</html>"
+msgstr "Teraz tam nie je otvorený súbor zmien."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Vytvorte rozhranie(hranice)"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Načítať aktuálne vybranú reláciu"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Prosím zadajte meno pre umiestnenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr "Názov miesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Najskôr zvoľte záložku"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Pridať všetky zvolené objekty medzi členy"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Pridať všetky zvolené objekty medzi členy"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min šírka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "max šírka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "max dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5987,369 +6188,139 @@
 "oblasti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Ohraničujúcí box"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Zdroje a typy dát"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "údaje OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Rozdeliť cestu vo zvolenom bode"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Nekomprimované (Raw) GPS dáta"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Označená cesta neobsahuje vybratý bod."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Načítať na novú vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Stiahnuť plochu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Stiahnuť"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Nie je vybraná žiadna relácia"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
 "Sťahovaná plocha je príliš veľká, server zrejme odmietne vašu požiadavku"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Sťahovaná plocha je v poriadku, veľkosť je akceptovaná serverom"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+#, fuzzy
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Kľuknutie zavrie dialóg a zruší vymazanie objektov"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Načítať aktuálne vybranú reláciu"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Prosím vyberte riadok na úpravu."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Zapíšte názov miesta pre vyhľadávanie:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Zapíšte názov miesta pre vyhľadávanie:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 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:168
-msgid "Please enter a search string"
-msgstr "Prosím zadajte hľadaný reťazec"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Nemôžem čítať miestny výsledok vyhľadávania zo servera"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Zapíšte názov miesta pre vyhľadávanie:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Miesta"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "meno"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "typ"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "blízko"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zväčšenie"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-"<b>Zväčšenie:</b> Kolieskom myši, dvojklik alebo Ctrl + Hore(Up)/Dole(Down) "
-"<b>Posun mapy:</b> Podržať pravé tlačítko myši a pohnúť myšou, alebo použiť "
-"kurzorové klávesy. <b>Výber:</b> Podržať ľavé tlačítko myši a nakresliť rám."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Slippy map"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "Úroveň zväčšenia"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x od"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "do"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y od"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Čísla dlaždíc"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr "JOSM Help Browser"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, fuzzy, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-"<html>Neúspešné otváranie a pripájanie na  vzdialený server<br>''{0}''."
-"<br>Prosím, skontrolujte vaše internetové pripojenie.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr "Otvoriť aktuálnu stránku pomoci v externom prehliadači"
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr "Upraviť aktuálnu stránku pomoci"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr "Preložiť aktuálnu stránku pomoci"
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr "Prejsť na predchádzajúcu stránku"
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr "Prejsť na nasledujúcu stránku"
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
 #, fuzzy
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-"Varovanie: neúspešné umiestnenie dialógového okna vždy navrchu. Výnimka "
-"bola: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Search ..."
+msgstr "Vyhľadávať..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
 #, fuzzy
-msgid "Failed to open help page"
-msgstr "Preložiť aktuálnu stránku pomoci"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr "Zemepisná šírka: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr "Zemepisná dĺžka: "
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr "Súradnice"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr "História pre bod {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr "História pre cestu {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr "História pre reláciu {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "Zavrieť dialógové okno"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr "Načítať históriu zo serveru"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"priebeh nieje zatiaľ inicializovaný. Chyba odkazového súboru pôvodných."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-"Neúspešné nastavenie odkazu. Odkaz ID {0} je nenájdený v histórii ID {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr "priebeh nie je inicializovaný. Chybný súbor aktuálnych pôvodných."
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "Nahrať priebeh"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr "Nahrať históriu pre bod {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr "Nahrať históriu pre cestu {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr "Nahrať históriu pre reláciu {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Bod {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Cesta {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relácia {0}"
+msgid "Click to start searching for places"
+msgstr "Smer hľadania zeme"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
+msgstr ""
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6706,4 +6677,6 @@
 #. 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" />
@@ -7084,6 +7057,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -7149,11 +7123,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -7163,6 +7137,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -7172,79 +7146,351 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Názov"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Typ"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "blízko"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+"<b>Zväčšenie:</b> Kolieskom myši, dvojklik alebo Ctrl + Hore(Up)/Dole(Down) "
+"<b>Posun mapy:</b> Podržať pravé tlačítko myši a pohnúť myšou, alebo použiť "
+"kurzorové klávesy. <b>Výber:</b> Podržať ľavé tlačítko myši a nakresliť rám."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Slippy map"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "Úroveň zväčšenia"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x od"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "do"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y od"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Čísla dlaždíc"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr "JOSM Help Browser"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr "Otvoriť aktuálnu stránku pomoci v externom prehliadači"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr "Upraviť aktuálnu stránku pomoci"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr "Preložiť aktuálnu stránku pomoci"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr "Prejsť na predchádzajúcu stránku"
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr "Prejsť na nasledujúcu stránku"
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr "Zemepisná šírka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr "Zemepisná dĺžka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr "Súradnice"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr "História pre bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr "História pre cestu {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr "História pre reláciu {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "Zavrieť dialógové okno"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr "Načítať históriu zo serveru"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+"priebeh nieje zatiaľ inicializovaný. Chyba odkazového súboru pôvodných."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+"Neúspešné nastavenie odkazu. Odkaz ID {0} je nenájdený v histórii ID {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr "priebeh nie je inicializovaný. Chybný súbor aktuálnych pôvodných."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr "chybná zadanie pôvodných. aktuálna verzia {0} nie je platná v priebehu"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "Nahrať priebeh"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr "Nahrať históriu pre bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr "Nahrať históriu pre cestu {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr "Nahrať históriu pre reláciu {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Cesta {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relácia {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Užívateľ"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr "Zmenový súbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7326,4 +7572,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr "Založiť (Launch) súbor podľa vyberajúcej osoby pre výber súboru"
@@ -7365,5 +7612,5 @@
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr "Vrstva ''{0}'' obsahuje zmeny pre uloženie."
+msgstr "Vrstva ''{0}'' nieobsahuje zmeny pre uloženie."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80
@@ -7647,6 +7894,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
 msgstr[0] "{0} upravený objekt:"
@@ -7749,5 +7996,16 @@
 msgstr "Zmenový súbor id > 0 očekávaný. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto "
+"pôvodných a zopakovanie nahratia."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr "Pripravujem pôvodné na nahratie ..."
@@ -7781,59 +8039,59 @@
 msgstr "Pokračovať v nahrávaní"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Obrázky pre {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Čítať GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Žiadny čas pre bod {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Čítam {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Nenájdené žiadne obrázky s časovými značkami."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Čítam {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS súradnicami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Štart GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Koniec GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "súčastná odchylka: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "rozdiel časových pásiem: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7842,51 +8100,51 @@
 msgstr[2] "obrázkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} vo vnútry stopy (track)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Synchronizovať hodiny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG obrázky (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Dáta v súbore \"{0}\" nemohli byť parsované."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "V súbore \"{0}\" nie je časová značka EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Obrázok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synchronizovať čas s GPS zariadením"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Zadaný čas nemôže byť rozparsovaný"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7894,30 +8152,30 @@
 msgstr "gps poloha bodu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Prispôsobiť kresliacu trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Použíť globálne nastavenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Výber nastavenia kreslenej čiary"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7925,5 +8183,5 @@
 msgstr "Prispôsobiť farbu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7932,5 +8190,5 @@
 msgstr "Predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7939,43 +8197,43 @@
 msgstr "Zvoľte farbu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Značky z pomenovaných bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pomenovanie trackpoints od {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importovať zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosúbory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Zukové značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importovať obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Meno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7986,28 +8244,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr "Časový interval"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Dĺžka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -8017,5 +8275,5 @@
 msgstr[2] "{0} trás, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -8025,10 +8283,10 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Konvertovať do dátovej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -8038,11 +8296,11 @@
 "chcete nahrať stopy (traces), pozrite sem:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -8052,29 +8310,29 @@
 msgstr "Prevedené z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Stiahnuť všetko vo vnútry:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Maximálna plocha na požiadavku:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -8085,13 +8343,9 @@
 "<br>Chcete pokračovať?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr "Sťahujem dáta"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8101,5 +8355,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8109,23 +8363,23 @@
 "ich času boli vynechané."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Údajová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "mimo ukladanej oblasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "verzia {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8135,12 +8389,13 @@
 msgstr[2] "Bolo tam zistených {0} konfliktov."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, fuzzy, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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} objekt bol očistený z lokálneho dátového súboru, pretože je zmazaný na "
@@ -8154,27 +8409,45 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr "Prosí pozrite Conflict List Dialog<br>a manuálne ho vyriešte."
-
+#, fuzzy, 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] "Prosí pozrite Conflict List Dialog<br>a manuálne ho vyriešte."
+msgstr[1] "Prosí pozrite Conflict List Dialog<br>a manuálne ho vyriešte."
+msgstr[2] "Prosí pozrite Conflict List Dialog<br>a manuálne ho vyriešte."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+#, fuzzy
+msgid "Click to close this dialog and continue editing"
+msgstr "Zavrieť tento dialóg a pokračovať v editácii v JOSMe"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} zmazané.)"
+msgstr[1] " ({0} zmazané.)"
+msgstr[2] " ({0} zmazané.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skladá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} zmazané.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "neuršený (unset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "Verzia API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8355,6 +8628,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8369,6 +8640,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8551,5 +8820,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8890,21 +9159,20 @@
 msgstr "Jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Povoliť vstavané východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
 msgid "Enable built-in icon defaults"
 msgstr "Povoliť built-in ocon východzí"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+msgid "Used style"
+msgstr "Použitý štýl"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
 msgid "Map Paint Styles"
 msgstr "Map Paint Styles"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
-msgid "Used style"
-msgstr "Použitý štýl"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
@@ -8918,6 +9186,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Aktualizovať"
@@ -9068,68 +9335,106 @@
 msgstr "Skratka"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+#, fuzzy
+msgid "Active styles"
+msgstr "Aktivovať"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr "Icon paths"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Short Description: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr "Autor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Internetová stránka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr "Verzia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr "Icon paths"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr "Kopírovať východzie"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Vyberte riadok na kopírovanie."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr "Pridať nový XML zdroj do zoznamu."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "Zmazať vybratý zdroj zo zoznamu."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr "Východzie (Pozrite nápovedu k ikone pre podrobnejšiu informáciu)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Pridať novú značku"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Zavrieť vybrané otvorené zmenové súbory"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Upraviť zvolený zdroj."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, fuzzy, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Nahrať históriu pre bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Nepodarilo sa nahrať dáta na alebo stiahnuť z<br>\"{0}\"<br>pre "
+"problém pri prenose dát.<br>Detaily (nepreložené): {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, fuzzy, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr "chybné hodnoty pre vlastnosti ''{0}''. Got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Menu Sort presets"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9332,5 +9637,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Viac informácii o tejto vlastnosti"
@@ -9396,16 +9701,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Predvolená skupina ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Predvolená skupina ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9413,5 +9718,5 @@
 msgstr "Pripája sa na OSM Server..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9522,5 +9827,5 @@
 msgstr "Rozloženie súboru \"{0}\" neúspešné"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu"
@@ -9757,5 +10062,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9782,5 +10087,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9788,5 +10093,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9799,5 +10104,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9808,33 +10113,33 @@
 msgstr "rozkladám obsah zo zmenového súboru..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Nesprávne heslo alebo meno."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Upozornenie: Heslo sa posiela nešifrované."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Uložiť meno a heslo (nešifrovane)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Prihlásenie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Základná URL pre OSM server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Prihlasovacie meno (e-mail) pre OSM konto."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9842,17 +10147,17 @@
 "Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo ukladať."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Základná Serverová URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "OSM užívateľské meno (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9963,5 +10268,5 @@
 msgstr "Súbor \"{0}\" neexistuje"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9972,30 +10277,30 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 "vytvoriť XML element <nd> element nie je ako priame dieťa z elementu <way>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "Chýba povinná vlastnosť ''{0}'' na <nd> z cesty {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "Neplatná hodnota vlastnosti ''ref'' z elementu <nd>. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 "Vytvoriť XML element <člen> nie je ako priame dieťa z elementu <relácia>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Chýba vlastnosť ''ref'' pre člena v relácii {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
@@ -10003,10 +10308,10 @@
 "Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -10015,19 +10320,19 @@
 "Neplatná hodnota vre vlastnosť ''type'' pre člena {0} v relácii {1}. Got {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletné <member> špecifikácie s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Vynechávam."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -10037,7 +10342,11 @@
 "Neplatná hodnota pre vlastnosť ''verzia'' na OSM pôvodné s id {0}. Got {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -10049,25 +10358,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Neznáma, alebo nepodporovaná API verzia. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "Chýba vlastnosť ''verzia'' na OSM pôvodných s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "Chýba povinná vlastnosť ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -10076,5 +10385,5 @@
 "Cesta s externou ID ''{0}'' obsahuje chýbajúci bod s externou ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -10085,5 +10394,5 @@
 "chýbajúci v nahratých dátach a je preto neúplná tiež."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -10091,5 +10400,5 @@
 msgstr "Neznámy typ relačného člena ''{0}'' v relácii s eterným id ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -10100,13 +10409,13 @@
 "''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Pripravujem OSM údaje..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr "Rozložiť OSM dáta..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr "Pripravujem dátový súbor ..."
@@ -10117,14 +10426,13 @@
 msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Stiahnuť z OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr "Sťahovanie odkazovaných ciest ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr "Sťahovanie odkazovaných relácií ..."
@@ -10243,15 +10551,15 @@
 "Ignorujem rozdielne nahrávanie."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Aktualizácia pluginov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Stiahnuť pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -10264,30 +10572,34 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "{0} Pluginy je úspešne stiahnuté. Prosím reštartujte JOSM."
 msgstr[1] "{0} Plugin je úspešne stiahnutý. Prosím reštartujte JOSM."
 msgstr[2] "{0} Pluginov je úspešne stiahnutých. Prosím reštartujte JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Sťahujem Pluginy {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "Vynechať sťahovanie"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "Stiahnuť Plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "Vynechať Sťahovanie"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10299,5 +10611,5 @@
 msgstr "Nastala chyba v plugine {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -10305,5 +10617,5 @@
 "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej potrebný."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10313,49 +10625,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Pluginy boli  naposledy aktualizované pred {0} dňami."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Aktualizácia pluginov"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Plugin {0} požaduje JOSM aktualizáciu na verziu {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Nebol nájdený plugin {0}, ktorý je vyžadovaný pluginom {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Plugin nenájdený: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Pluginy boli  naposledy aktualizované pred {0} dňami."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"Môžete zmeniť počet dní pre objavovanie sa tohto varovania <br>by setting "
-"the config option 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Nemôžem nahrať plugin {0}. Zmazať z konfigurácie?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Vypnúť doplnok"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Zachovať plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10365,9 +10686,9 @@
 "ich prepísaniu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr "<html>"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10376,10 +10697,10 @@
 "Vyskytla sa chyba pravdepodobne zapríčinená doplnkom (angl: plugin) ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Podľa informácie v doplnku jeho autorom je ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10387,9 +10708,9 @@
 "Vyskúšajte aktualizovať plugin na najnovšiu verziu pre nahláseným chyby."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Vypnúť doplnok?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10399,22 +10720,22 @@
 "prestal používať."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr "Plugin nemôže byť odstránený. Pravdepodobne to bolo už vypnuté."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr "Informácia o pluginoch"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "Popis nedostupný"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "Viac detailov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10424,18 +10745,18 @@
 msgstr[2] "Informácie o pluginoch stiahnuté z {0} stránok"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Nenájdené informácie o plugine"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Plug-in {0} nie je dostupný. Aktualizácia preskočená."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Všetky nainštalované pluginy sú aktuálne."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10448,9 +10769,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Stiahnuť chýbajúca pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10465,9 +10786,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10489,19 +10810,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "neznámy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Verzie {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin je zahrnutý v JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10565,5 +10886,5 @@
 msgstr "(Text už bol skopírovaný do schránky.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10575,5 +10896,5 @@
 "pripojení.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10585,5 +10906,5 @@
 "limitu.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10596,5 +10917,5 @@
 "odkaz z relácie {0}, a nahrajte znovu.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10607,10 +10928,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10621,5 +10942,5 @@
 "uzavretý.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10628,16 +10949,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10651,5 +10972,5 @@
 "applet z ''{1}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10660,5 +10981,5 @@
 "<br>Prosím, skontrolujte vaše internetové pripojenie.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10669,5 +10990,5 @@
 "problém pri prenose dát.<br>Detaily (nepreložené): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10678,10 +10999,10 @@
 "veľmi pravdepodobne a dočasný problém. Prosím skúste znovu pozdejšie.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
 msgstr "OSM server ''{0}'' hlási zlý príkaz.<br>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10693,10 +11014,10 @@
 "súbor poskytnutý OSM komunitou."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr "<br>Chybná správa(nepreložený): {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10711,5 +11032,5 @@
 "serverov ''{0}'' kvôli preklepom."
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10722,5 +11043,5 @@
 "URL vo vašich nastaveniach a vaše internetové pripojenie.</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10735,5 +11056,5 @@
 "<br><br>Chybová správa je:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10850,13 +11171,4 @@
 "nastavenie s kľúčom ''{0}'' neexistuje. Nemôžem obnoviť geometriu okna z "
 "nastavení."
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
-msgstr ""
-"Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
-"východziu geometriu. Detaily: {1}"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -11004,5 +11316,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -11019,10 +11332,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Nepárny (odd)"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -11030,103 +11343,103 @@
 msgstr "Vyrovnať (even)"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr "Abecedne"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr "Relácia: {0}"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr "Pridružiť s využitím ulice:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr "Číslovací systém:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr "Spustenie #:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr "Ukončenie #:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr "Pridružiť {0} dodatočné body s číslami domov"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr "Mesto:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr "Štát:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr "PSČ:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr "Krajina:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr "Úplná Adresa:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr "Voliteľné informácie:"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr "Prosím zvoľte ulicu pre pridruženie s adresami vloženou cestou"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr "Prosím vyberte adresami  vloženú cestu pre túto ulicu"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr "Očakávané nepárne čísla pre adresy"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr "Očakávané párne čísla pre adresy"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr "Kód krajiny musí byť z 2 písmen"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr "Prosím vložte platné číslo pre spustenie a ukončenie doplnenia adries"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr "Abecedné adresy musia končiť s písmenom"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr "Počiatočné a koncové čísla musia byť rovnaké pre abecedné adresy"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr "Spúšťajúce písmeno adresy musí byť nižšie ako konečné písmeno adresy"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr "Prosím vložte platné číslo pre spustenie adresovania"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr "Prosím vložte platné číslo pre ukončenie adresovania"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr "Spúšťajúce adresné číslo musí byť nižšie ukončovacie adresné číslo"
@@ -11180,46 +11493,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Získavam GPS polohu z EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Začínam prehľadávať adresár"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Niektorý z vybratých súborov bol prázdny !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Čítať fotky..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemôžem získať cestu pre adresár {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prehľadávam adresár {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nájdený prázdny súbor v adresári {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba pri získavaní súború z adresára {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Zladiť GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11483,5 +11797,5 @@
 msgstr "Chyba v súbore {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11497,10 +11811,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr "Vybrať Feuille"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11550,13 +11864,13 @@
 msgstr "Vybrať z..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Automatické získavanie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11568,13 +11882,13 @@
 "Budete si želať obnoviť F11 pre grabovanie?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr "Obnoviť klávesovú skratku pre grabovanie F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM ja zastavený aby zmeny mohli byť prevedené"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11695,7 +12009,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Zobrazovať súradnice ako"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11713,5 +12026,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11754,13 +12067,13 @@
 msgstr "Vytvorte rozhranie(hranice)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr "Spájam cadastre WMS ..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr "Obrázok je už načítaný"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11904,22 +12217,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Zmeniť umiestnenie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Nastavenie nového miesta pre ďalšiu požiadavku"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Pridať novú vrstvu"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11929,5 +12242,5 @@
 "www.cadastre.gouv.fr .</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Pridať novú vrstvu"
@@ -11941,9 +12254,9 @@
 msgstr "Získať nové cookie (časový limit na súčasné sedenie)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr "PNG súbory (*.png)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr "Exportovať ako PNG formát (iba rastrové obrázky)"
@@ -11967,5 +12280,5 @@
 msgstr "Upraviť pozíciu WMS vrstvy (iba rastrové obrázky)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11989,5 +12302,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Prázdna vrstva"
@@ -12016,5 +12329,5 @@
 msgstr "Hranice obce bbox: {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -12025,9 +12338,9 @@
 "Vytvorte nový súbor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Cache chýb formátov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
@@ -12036,9 +12349,9 @@
 "Lambertova zónou {1}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "Cache chýb v Lambert Zóne"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -12135,5 +12448,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Neboli načítané žiadne dáta."
@@ -12542,7 +12855,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "voda"
@@ -12755,32 +13068,32 @@
 msgstr "LiveGPS layer"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Nahrať GPS Stopu"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Pripojiť to gpsd server a ukázať aktuálnu polohu v LiveGPS vrstve."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Vycentrovať (Center Once)"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Stred LiveGPS vrstvy v aktuálnej polohe."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Automatický stred (Auto-Center)"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Nepretržite stred LiveGPS vrstvy do aktuálnej polohy"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12870,24 +13183,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr "Vytvoriť multipolygón"
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr "Vytvoriť multipolygón."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr "Jedna z vybraných ciest už je súčasťou iného multipolygónu."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -13042,4 +13355,9 @@
 msgstr "Spúšťací súbor Firefoxu"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Vrstva"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -13088,30 +13406,30 @@
 msgstr "Povolené činnosti"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Vzdialená kontrola požiadala o načítanie dát z API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požiadavky: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povoliť?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Potvrdiť činnosť vzdialenej kontroly"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr "Vzdialená Správa s spýtala na vytvorenie nového bodu."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Vzdialená kontrola požiadala o import dát z nasledujúcej URL:"
@@ -13130,7 +13448,5 @@
 msgstr "Nie je vybraná žiadna relácia"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -13139,4 +13455,5 @@
 #: ../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 "Trasovanie (Routing)"
@@ -13158,25 +13475,25 @@
 msgstr "Otvoriť zoznam trasových bodov"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
 msgid "Add routing layer"
 msgstr "Pridať routing layer"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Kritérium"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "Najkratšia"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "Najrýchlejšia"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Opačná trasa"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Vymazať trasu"
@@ -13206,93 +13523,87 @@
 msgstr "Vstup hmotnostnej hodnoty"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Automatické zväčšenie: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Nahrať Dlaždice (Tiles)"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
-msgstr "Zobraziť Stav Dlaždíc"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Žiadosť na aktualizáciu"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
+msgstr "Zobraz info"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Nahrať Všetky Dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Priblíženie"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Oddialiť"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "obrázok "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "automatické zväčšenie"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "automatické nahratie dlaždíc"
 
 #. 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "SlippyMap"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Nastavenia pre SlippyMap plugin."
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Zdroje Dlaždíc"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Automatické zväčšenie: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Automatické nahratie Dlaždíc: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Max zväčšenie lvl: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Max zväčšenie lvl: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Vyblednúť pozadie: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "chyba pri zavádzaní metadát"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr "cymbá žiadosť o aktualizáciu: not zoom-level 12"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "požadovaný: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "chyba požadovanej aktualizácie"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -13305,5 +13616,5 @@
 msgstr "Uložiť zachytené dáta do súboru každý minútu."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13470,5 +13781,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Názov ulice"
@@ -13515,29 +13826,29 @@
 msgstr "Prosím vyberte aspoň jednu uzavretú cestu ktorá by mala byť spojená."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "Pridať body na všetky priesečníky"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Vymazať cesty, ktoré nie sú  vnútornou časťou multipolygónu"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Oprava relácie"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Spojená prekrývajúca sa plocha"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Spojené prekrývajúce sa plochy"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13547,33 +13858,33 @@
 "overte či to nepredstavuje nejakú chybu."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Zadajte hodnoty pre všetky konflikty"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Riešenie konfliktov"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Oprava konfliktu (rozporu) značiek"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Odstránený Prvok z Relácií"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Spojiť plochy: Vymazať krátke cesty"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Uzavretá cesta"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Vymazať značky z vnútorných ciest"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "Funkcie Spojenia Plôch (Join Areas Function)"
@@ -13786,8 +14097,4 @@
 msgstr "Opraviť označené chyby."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignorovať"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13832,25 +14139,24 @@
 msgstr "Nahradiť \"{0}\" za \"{1}\" pre"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Línia pobrežia."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Tento test kontroluje správnosť línií pobrežia."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Neusporiadané pobrežie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Neusporiadané pobrežie"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Neusporiadané pobrežie"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13874,18 +14180,18 @@
 msgstr "Zkrížené cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Duplicitné body"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Tento test zisťuje či nie je viac bodov na jednom mieste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr "Body s rovnakou pozíciou"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr "Potvrdenie"
@@ -14137,4 +14443,8 @@
 msgstr "Upraviť zvolený zdroj."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Zmazať vybratý zdroj zo zoznamu."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -14351,7 +14661,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "budova"
@@ -14365,5 +14675,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "oblasť (plocha)"
@@ -14373,25 +14683,25 @@
 msgstr "Neuzavretá cesta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Nepripojené cesty."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr "Tento test kontroluje blízkosť koncových bodov ciest k iným cestám"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Koncový bod cesty je blízko inej komunikácie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Koncový bod cesty je blízko inej cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Bod cesty je blízko inej cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Spojený koncový bod cesty je blízko inej cesty"
@@ -14486,22 +14796,26 @@
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
-#, fuzzy
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
-msgstr "Walking Papers: {0}"
-
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "Vybrať a spustiť body na konci cesty"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "Je dosiahnutý koniec línie"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "Je dosiahnuté spojenie"
@@ -14769,9 +15083,9 @@
 msgstr "Chyba formátu súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Otvoriť prázdnu WMS vrstvu, aby sa nahrali dáta zo súboru"
@@ -15266,6 +15580,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Ref. číslo"
@@ -15827,5 +16141,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr "kov"
@@ -15837,5 +16151,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "drevo (wood)"
@@ -16123,7 +16437,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "áno"
@@ -16272,8 +16586,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "nie"
@@ -16400,31 +16714,4 @@
 msgstr "Upraviť kruhový objazd"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Typ"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16545,5 +16832,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "obytná (osídlená)"
@@ -16578,5 +16865,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "obslužná (service)"
@@ -16611,5 +16898,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "konštrukcia"
@@ -16999,12 +17286,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operátor"
@@ -17218,6 +17505,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Nadmorská výška"
@@ -17650,5 +17937,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "močiar (marsh)"
@@ -18182,25 +18469,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Otváracia doba"
@@ -18266,24 +18553,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr "24/7"
@@ -18296,24 +18583,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pi 08:30-20:00"
@@ -18326,24 +18613,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ut-Ne 08:00-15:00; So 08:00-12:00"
@@ -18376,6 +18663,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Referenčné číslo"
@@ -18391,5 +18678,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "podzemie"
@@ -18403,5 +18690,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Poplatok"
@@ -18637,5 +18924,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Prístrešok"
@@ -19103,5 +19390,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -19116,5 +19403,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Lyžovanie"
@@ -19268,16 +19555,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Archeologické nálezisko"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Upraviť archeologické nálezisko"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Pomník"
@@ -19285,55 +19585,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Hraničné kamene"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Upraviť hraničné kamene"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Voľný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Ihrisko"
@@ -19341,35 +19641,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "Športy"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -19383,6 +19683,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "vyberte šport:"
@@ -19774,30 +20074,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "šport"
@@ -19807,68 +20107,68 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "lukostreľba"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kanoe"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "lezenie"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
@@ -19876,162 +20176,215 @@
 "trávnika)"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "bicyklovanie"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "závody chrtov"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "jazdectvo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "americký futbal"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "konské dostihy"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "automobilový"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "streľba"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "korčuľovanie"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "lyžovanie"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "futbal (soccer)"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "plávanie"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "stolný tenis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
+
+#. 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 "typ"
 
 #. item "Sport/Multi" combo "type"
@@ -20068,203 +20421,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "hracia plocha, ihrisko"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "športové centrum"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "štadión"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stopa"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motošport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Upraviť motošport"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
@@ -20272,56 +20625,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "stredne pokročilý (intermediate)"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "pokročilý (advanced)"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Streľba"
@@ -20329,182 +20682,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Upraviť streľbu"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Americký futbal"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Upraviť americký futbal"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Upraviť kriket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Upraviť ragby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Človekom-Vytvorené (Man-Made)"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Budovy, stavby"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Budova"
@@ -20512,5 +20865,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -20518,10 +20871,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Upraviť verejnú budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -20529,10 +20882,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Upraviť radnicu (obecný úrad)"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -20540,10 +20893,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Upraviť veľvyslanectvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Súd"
@@ -20552,10 +20905,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Vezenie"
@@ -20564,10 +20917,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polícia"
@@ -20577,10 +20930,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Upraviť políciu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -20589,10 +20942,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Upraviť hasičskú stanicu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Pošta"
@@ -20600,5 +20953,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Upraviť poštu"
@@ -20606,15 +20959,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Škola"
@@ -20622,10 +20975,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Upraviť školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Univerzita"
@@ -20633,10 +20986,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Upraviť Univerzitu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Vysoká škola"
@@ -20644,5 +20997,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Upraviť vysokú školu"
@@ -20650,5 +21003,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kino"
@@ -20657,10 +21010,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Upraviť kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Knižnica"
@@ -20669,9 +21022,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Upraviť knižnicu"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -20679,10 +21032,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Upraviť kultúrne stredisko"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Divadlo"
@@ -20691,10 +21044,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Upraviť divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -20704,5 +21057,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Upraviť kostol"
@@ -20711,6 +21064,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Náboženstvo"
@@ -20719,66 +21072,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "baháisti"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "budhisti"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "kresťania"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hinduisti"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "džinisti"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "judaisti"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "moslimovia"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "spiritualisti"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoisti"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr "unitársky"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Vyznanie (cirkevné)"
@@ -20787,81 +21140,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglikánska"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptistická"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "katolícka"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evanjelikánska"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "svedkovia jehovovi"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "lutheránska"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "methodistická"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormónska"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "orthodoxná"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbiteriánska"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestanská"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "quakerská"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "šiítska"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunnitská"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresy"
@@ -20870,5 +21223,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Upraviť informácie o adrese"
@@ -20876,5 +21229,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Číslo domu"
@@ -20882,20 +21235,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Meno domu"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Názov mesta"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Poštové smerovacie číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Kód krajiny"
@@ -20904,5 +21257,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Upraviť interpoláciu adries"
@@ -20910,61 +21263,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Schéma číslovania"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "nepárne"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "párne"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "abecedný"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Veža"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Typ veže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "telekomunikačná"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "pozorovateľňa"
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Výška (metre)"
@@ -20972,25 +21325,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Maják"
@@ -20998,10 +21351,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -21009,10 +21362,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -21021,37 +21374,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Upraviť potrubie"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "ropa(oil)"
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "splašky(sewage)"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "teplo(heat)"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "nejaké látky(any substance)"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "podvodné(underwater)"
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "nadzemné(overground)"
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -21061,10 +21414,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Žeriav"
@@ -21072,10 +21425,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Upraviť žeriav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Signál (rádiomaják)"
@@ -21083,10 +21436,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -21094,10 +21447,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -21105,5 +21458,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Upraviť pozorovaciu kameru"
@@ -21111,5 +21464,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -21119,35 +21472,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Transformátorová stanica"
@@ -21156,10 +21509,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Upraviť trafostanicu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Malý transformátor"
@@ -21168,5 +21521,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Upraviť malý transformátor"
@@ -21174,10 +21527,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Elektrický stožiar (vysoké napätie)"
@@ -21188,23 +21541,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Upraviť elektrický stožiar"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr "veža"
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr "stožiar(pole)"
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr "Nastavenie veže"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Elektrické vedenie"
@@ -21213,75 +21566,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr "Typ vedenia"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr "vedenie"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr "vedľajšie_vedenie"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Napätie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr "Počet káblov"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Počet vodičov (lepší: vodič) pre napájacie káble"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr "jedno"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr "dvojité"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr "trojité"
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr "štvorité"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Toalety"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefón"
@@ -21290,5 +21643,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Upraviť telefón"
@@ -21296,5 +21649,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Mince"
@@ -21302,5 +21655,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Bankovky"
@@ -21308,5 +21661,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Platobné karty a Kreditné karty"
@@ -21314,5 +21667,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Debetné karty"
@@ -21320,15 +21673,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -21337,5 +21690,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Upraviť recykláciu (zber)"
@@ -21343,35 +21696,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Handry"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Železný šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Lavička"
@@ -21380,31 +21733,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr "Oreradlo chrbta (Backrest)"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr "kameň"
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr "Farba"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr "čierna"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr "hnedá"
@@ -21475,40 +21828,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "zelená"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "tráva (grass)"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr "biela"
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr "Počet sedadiel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Poľovnícky posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
@@ -21517,30 +21869,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Skryť"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Fontána"
@@ -21549,10 +21901,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -21561,10 +21913,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
@@ -21572,33 +21924,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Upraviť hniezdo záchrany"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Upraviť supermarket"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr "Lekáreň"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr "Upraviť lekáreň"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Obchod s polotovarmi"
@@ -21606,9 +21958,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Upraviť obchod s polotovarmi"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Stánok"
@@ -21616,27 +21968,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Upraviť stánok"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr "Kníhkupectvo"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr "Upraviť kníhkupectvo"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr "Cestovná kancelária"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr "Upraviť cestovnú kanceláciu"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Predajný automat"
@@ -21644,5 +21996,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Upraviť predajný automat"
@@ -21650,88 +22002,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Predávané výrobky"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "lístky MHD"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "plány MHD"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "parkovacie lístky"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "jedlo"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "pitie"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "fotky"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "krmivo pre zvieratá"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "telefónne kupóny (poukážky)"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "kupóny (poukážky)"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "kondómy"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "Prístupové alebo vernostné karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Mäsiareň"
@@ -21739,9 +22091,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Upraviť mäsiarstvo"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Chlieb a pečivo"
@@ -21749,9 +22101,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Upraviť chlieb a pečivo"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Kvetinárstvo"
@@ -21759,18 +22111,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Upraviť kvetinárstvo"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "Biopotraviny"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "Upraviť biopotraviny"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -21778,54 +22130,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "Upraviť Obchod s alkoholickými nápojmi"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "Upraviť Obchod s nápojmi."
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Počítač"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Upraviť počítačový obchod"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Upraviť obchod s elektronikou"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Upraviť obchod s Hifi elektronikou"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Nábytok"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Upraviť obchod s nábytkom"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Záhradné centrum"
@@ -21833,9 +22185,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Upraviť záhradné centrum"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Železiarstvo"
@@ -21843,9 +22195,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Upraviť železiarstvo"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Obchod Urob si sám"
@@ -21853,54 +22205,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Upraviť obchod Urob si sám"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Papierníctvo"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Upraviť papierníctvo"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Kaderníctvo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Upraviť kaderníctvo"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Obuva"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuvou"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Hračky"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Upraviť obchod s hračkami"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Obchod s DVD"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Upraviť obchod s DVD"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Chemická čistiareň"
@@ -21908,9 +22260,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Upraviť chemickú čistiareň"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Práčovňa"
@@ -21918,9 +22270,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Upraviť práčovňu"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Turistický (Outdoor)"
@@ -21928,28 +22280,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Upraviť športový obchod"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Upraviť očnú optiku"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Hotovosť"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Banka"
@@ -21957,14 +22309,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Upraviť banku"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Zmenáreň"
@@ -21972,5 +22324,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Upraviť zmenáreň"
@@ -21978,15 +22330,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Upraviť bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Zdravie"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Lekári"
@@ -21994,18 +22346,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Upraviť lekárov"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Zubný lekár"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Upraviť zubného lekára"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Lekáreň"
@@ -22013,5 +22365,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Upraviť lekáreň"
@@ -22019,9 +22371,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "výdaj na recepty"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Nemocnica"
@@ -22029,10 +22381,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Upraviť nemocnicu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -22041,5 +22393,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Upraviť pohotovosť (záchrannú službu)"
@@ -22048,20 +22400,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Telefónne číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -22069,5 +22421,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -22076,59 +22428,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Upraviť veterinárnu ambulanciu"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr "Geografia(Zemepis)"
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Miesta"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Upraviť kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Krajina (štát)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Stav"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Upraviť štát"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Oblasť (región)"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "kraj (okres)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
@@ -22136,15 +22493,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Mesto (city)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Mesto (town)"
@@ -22152,10 +22509,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Štvrť"
@@ -22163,25 +22520,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Upraviť štvrť"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Dedina"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Malá dedina / osada / samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
@@ -22189,5 +22546,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
@@ -22195,10 +22552,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Upraviť oblasť (lokalitu)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Ostrov"
@@ -22206,10 +22563,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Upraviť Ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr "Ostrovček"
@@ -22217,5 +22574,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr "Upraviť ostrovček"
@@ -22223,5 +22580,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Vstup do jaskyne"
@@ -22229,10 +22586,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Upraviť vstup do jaskyne"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Vrchol"
@@ -22240,10 +22597,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Upraviť vrchol kopca"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Ľadovec"
@@ -22251,10 +22608,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Upraviť ľadovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Sopka"
@@ -22262,70 +22619,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Upraviť sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Štátna"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Upraviť štátne hranice"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Administratívne"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Upraviť administratívne hranice"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Občianske"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Upraviť občiansku hranicu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "Politická"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Upraviť politickú hranicu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "Národný park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Strom"
@@ -22334,15 +22691,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Upraviť strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Botanický názov"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Drevo"
@@ -22351,5 +22708,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Upraviť Drevo"
@@ -22357,17 +22714,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "ihličnatý"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "zmiešaný"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Les"
@@ -22376,14 +22733,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Upraviť les"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Prírodná rezervácia"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Upraviť prírodnú rezerváciu"
@@ -22391,25 +22748,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Sutina"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Upraviť sutinu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Krovie"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Upraviť krovie"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -22417,5 +22774,5 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr ""
@@ -22423,5 +22780,5 @@
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Vresovisko"
@@ -22429,5 +22786,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Upraviť vresovisko"
@@ -22435,5 +22792,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Farma"
@@ -22442,45 +22799,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Upraviť farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Poľnohospodárska pôda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Upraviť poľnohospodárske pôdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Lúka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Upraviť lúku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Vinica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Upraviť vinicu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Ťažobný priestor"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Upraviť ťažobný priestor"
@@ -22488,25 +22845,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Záhrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Upraviť záhradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Upraviť trávnatú plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Obecná zeleň"
@@ -22514,10 +22871,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Upraviť obecnú zeleň"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Spoločné, obecné"
@@ -22525,20 +22882,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Upraviť spoločné, obecné"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Upraviť park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Rekreačná oblasť"
@@ -22546,5 +22903,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upraviť rekreačnú oblasť"
@@ -22552,15 +22909,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Osídlená oblasť (Residential area)"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Upraviť osídlenú oblasť"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Cintorín (malý, blizko kostola)"
@@ -22568,9 +22925,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Upraviť cintorín (malý, blizko kostola)"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Cintorín"
@@ -22578,39 +22935,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Upraviť cintorín"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Maloobchod"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Upraviť oblasť s maloobchodmi"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Obchodná (komerčná)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Upraviť obchodnú (komerčnú) oblasť"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Priemysel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Upraviť priemyselnú oblasť"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Železničný pozemok"
@@ -22618,15 +22975,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Upraviť železničný pozemok"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Armáda"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Upraviť vojenskú oblasť"
@@ -22634,55 +22991,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Stavebná oblasť"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Upraviť stavebnú oblasť"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Upraviť brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Skládka odpadov"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Upraviť skládku odpadov"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Upraviť lom"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -22692,5 +23049,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Upraviť multipolygón"
@@ -22699,10 +23056,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -22710,5 +23067,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -22717,5 +23074,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr "Upraviť prikázané smery jazdy (turn restriction)"
@@ -22723,34 +23080,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -22759,15 +23116,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "k ceste"
@@ -22775,5 +23132,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -22782,5 +23139,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr "Upraviť Cestu (Route)"
@@ -22788,5 +23145,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr "Typ Cesty (Route)"
@@ -22858,5 +23215,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22865,17 +23222,17 @@
 msgstr "bicykel"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr "lyžovanie"
@@ -22928,5 +23285,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22935,13 +23292,13 @@
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "turistika"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr "obchádzka"
@@ -22955,10 +23312,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -22966,31 +23323,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "Sieť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr "Štátna cesta"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -22999,30 +23356,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
@@ -23460,11 +23817,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "zastaralý"
@@ -25488,5 +25845,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "osvetlená_voda (light_water)"
@@ -26158,4 +26515,12 @@
 #.
 #. <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"/>
@@ -26180,5 +26545,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "historické"
@@ -26192,5 +26557,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "lom"
@@ -26204,5 +26569,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "skládka odpadov (landfill)"
@@ -26224,5 +26589,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
@@ -26236,5 +26601,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "les"
@@ -26248,5 +26613,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "farmy"
@@ -26269,5 +26634,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "maloobchody"
@@ -26281,5 +26646,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "závody"
@@ -26293,5 +26658,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "brownfield (opustený priemyselný objekt)"
@@ -26305,5 +26670,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)"
@@ -26317,5 +26682,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "železničný pozemok"
@@ -26372,7 +26737,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "armáda"
@@ -26386,5 +26751,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "cintorín (cemetery)"
@@ -26397,5 +26762,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "vrchol (peak)"
@@ -26410,5 +26775,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "ľadovec (glacier)"
@@ -26422,5 +26787,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "sopka"
@@ -26475,8 +26840,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "prírodné (natural)"
@@ -26490,5 +26855,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "oblasť pokrytá krovím"
@@ -26502,5 +26867,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "vresovisko"
@@ -26514,8 +26879,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "oblasť (plocha)"
+msgstr ""
 
 #. color water
@@ -26527,5 +26891,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "blato (mud)"
@@ -26539,5 +26903,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "pláž (beach)"
@@ -26615,8 +26979,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "trasa (route)"
@@ -26664,7 +27028,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "hranica (boundary)"
@@ -26814,11 +27178,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "miesto"
@@ -26866,6 +27230,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "adresa"
@@ -27173,68 +27537,139 @@
 msgstr "Czech UHUL:ORTOFOTO"
 
+#~ msgid "File could not be found."
+#~ msgstr "Súbor nie je možné nájsť."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Prosím zvolte aspoň jednu úlohu k stiahnutiu"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Nahrávanie na OSM API neúspešné"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Konfliktné vzťahy (relation)"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
+#~ "<br>Delete from relation?</html>"
+#~ msgstr ""
+#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\" s úlohou {2}.<br>Zmazať z "
+#~ "relácie?</html>"
+
+#~ msgid ""
+#~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
+#~ "relation?</html>"
+#~ msgstr ""
+#~ "<html>Výber \"{0}\" je použitý reláciou \"{1}\".<br>Zmazať z relácie?</"
+#~ "html>"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Chyba pri rozkladaní"
+
+#~ msgid "File not found"
+#~ msgstr "Súbor nebol nájdený"
+
+#~ msgid "Replace"
+#~ msgstr "Nahradiť"
+
+#~ msgid "Replace the way this member refers to with the combined way"
+#~ msgstr "Nahradiť cestu s odkazom na jej člena so spojením cesty"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Prosím najskôr zadajte požadované koordináty."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Najskôr zvoľte záložku"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Prosím zadajte hľadaný reťazec"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Nemôžem čítať miestny výsledok vyhľadávania zo servera"
+
+#~ msgid "name"
+#~ msgstr "meno"
+
+#~ msgid "zoom"
+#~ msgstr "zväčšenie"
+
+#~ msgid "Copy defaults"
+#~ msgstr "Kopírovať východzie"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Vyberte riadok na kopírovanie."
+
+#~ msgid "The XML source (URL or filename) for {0} definition files."
+#~ msgstr "The XML zdroj (URL alebo názov súboru)pre {0} rozlíšenie súborov."
+
+#~ msgid "Add a new XML source to the list."
+#~ msgstr "Pridať nový XML zdroj do zoznamu."
+
+#~ msgid "Defaults (See tooltip for detailed information)"
+#~ msgstr "Východzie (Pozrite nápovedu k ikone pre podrobnejšiu informáciu)"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "Môžete zmeniť počet dní pre objavovanie sa tohto varovania <br>by setting "
+#~ "the config option 'pluginmanager.warntime'.)"
+
+#~ msgid ""
+#~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
+#~ "to default geometry. Details: {1}"
+#~ msgstr ""
+#~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
+#~ "východziu geometriu. Detaily: {1}"
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Zobraziť Stav Dlaždíc"
+
+#~ msgid "Request Update"
+#~ msgstr "Žiadosť na aktualizáciu"
+
+#~ msgid "error loading metadata"
+#~ msgstr "chyba pri zavádzaní metadát"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "cymbá žiadosť o aktualizáciu: not zoom-level 12"
+
+#~ msgid "requested: {0}"
+#~ msgstr "požadovaný: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "chyba požadovanej aktualizácie"
+
+#~ msgid "Move"
+#~ msgstr "Presunúť"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Vyriešiť konflikty"
+
+#~ msgid "my version:"
+#~ msgstr "moja verzia:"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Unknown version"
+#~ msgstr "Neznáma verzia"
+
+#~ msgid "Change"
+#~ msgstr "Zmeniť"
+
+#~ msgid "unnamed"
+#~ msgstr "nepomenované"
+
+#~ msgid "No data imported."
+#~ msgstr "Neboli importované žiadne dáta."
+
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Chyba pri načítaní stránky {0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr ""
-#~ "Chýbajúca stránka s pomocou. Vytvorte to v <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Chýbajúca stránka s pomocou. Vytvorte to v  <A HREF=\"{0}\">English</A> "
-#~ "or <A HREF=\"{1}\">váš jazyk</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Nápovedu môžete upravovať iba z online nápovedy JOSM"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\""
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Použiť prednastavenie \"{0}\""
-
-#~ msgid "Preset group ''{0}'' of group ''{1}''"
-#~ msgstr "Prednastavená skupina ''{0}'' zo skupiny ''{1}''"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "Nastaviť ručne Lambert zone (e.g. for locations between two zones)"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Najprv vytvorte nejakú vrstvu (GPX, OSM, cache)"
-
-#~ msgid "Move"
-#~ msgstr "Presunúť"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Vyriešiť konflikty"
-
-#~ msgid "my version:"
-#~ msgstr "moja verzia:"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Unknown version"
-#~ msgstr "Neznáma verzia"
-
-#~ msgid "Aborting..."
-#~ msgstr "Prerušujem..."
-
-#~ msgid "Change"
-#~ msgstr "Zmeniť"
-
-#~ msgid "unnamed"
-#~ msgstr "nepomenované"
-
-#~ msgid "No data imported."
-#~ msgstr "Neboli importované žiadne dáta."
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
@@ -27267,4 +27702,10 @@
 #~ "Môžete použiť koliesko myši alebo Ctrl+Šípky pre zväčšenie, alebo  posun"
 
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\""
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Použiť prednastavenie \"{0}\""
+
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Pridať všetky zvolené objekty medzi členy"
@@ -27323,4 +27764,7 @@
 #~ msgstr ""
 #~ "Prosím vyberte cesty s takmer pravými uhlami pre vytvorenie pravouhlosti."
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Nápovedu môžete upravovať iba z online nápovedy JOSM"
 
 #~ msgid "Open in Browser"
@@ -27517,4 +27961,7 @@
 #~ msgid "sports"
 #~ msgstr "Športový"
+
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr "Nastaviť ručne Lambert zone (e.g. for locations between two zones)"
 
 #~ msgid "Selected makes your trace public in openstreetmap.org"
@@ -27850,4 +28297,7 @@
 #~ "vývojárov JOSM."
 
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Najprv vytvorte nejakú vrstvu (GPX, OSM, cache)"
+
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 #~ msgstr "Neočakávaný \"type\" člena {0} relácie  {1} (hodnota {2})"
@@ -27879,7 +28329,4 @@
 #~ msgid "Undeleting Way..."
 #~ msgstr "Obnovovanie cesty..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Ponechať zdroj"
 
 #~ msgid "Checking whether primitive {0} is gone ..."
@@ -28116,7 +28563,4 @@
 #~ "pokračovať?"
 
-#~ msgid "There is currently no changeset open."
-#~ msgstr "Teraz tam nie je otvorený súbor zmien."
-
 #~ msgid "Close current changeset"
 #~ msgstr "Zavrieť aktuálny súbor zmien"
@@ -28204,4 +28648,7 @@
 #~ "API verzia je ''0.5''. Got {1}"
 
+#~ msgid "Preset group ''{0}'' of group ''{1}''"
+#~ msgstr "Prednastavená skupina ''{0}'' zo skupiny ''{1}''"
+
 #~ msgid "Processing {0}"
 #~ msgstr "Spracovávanie {0}"
@@ -28221,4 +28668,15 @@
 #~ msgid "MIddle way: {0}"
 #~ msgstr "Stred(MIddle) cesty: {0}"
+
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr ""
+#~ "Chýbajúca stránka s pomocou. Vytvorte to v <A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Chýbajúca stránka s pomocou. Vytvorte to v  <A HREF=\"{0}\">English</A> "
+#~ "or <A HREF=\"{1}\">váš jazyk</A>."
 
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 18273)
+++ applications/editors/josm/i18n/po/sl.po	(revision 18508)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-17 14:49+0000\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-25 13:47+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,67 +17,67 @@
 "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: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Priprava grafičnega uporabniškega vmesnika"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Pomoč"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -90,12 +90,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -105,27 +99,26 @@
 msgstr "Pozor"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -133,23 +126,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -157,5 +151,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -164,21 +158,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -187,5 +182,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -198,17 +193,9 @@
 msgstr "Napaka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "NEZNANO"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "O programu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Prikaži informacije o programu."
@@ -216,37 +203,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Javanski urejevalnik za OpenStreetMap"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Različica {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Zadnja sprememba {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java različica {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Domača stran"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Prijava napak"
@@ -256,5 +243,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -262,33 +249,29 @@
 msgstr "Podrobnosti"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Preberi me"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Različica"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Prispevki"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licenca"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Vstavki"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "O JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Datoteke ni bilo moč najti."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -319,42 +302,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -362,5 +344,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -373,19 +355,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -394,50 +376,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Dodaj vozlišče..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Dodaj vozlišče z vpisom zemljepisne širine in dolžine"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Uredi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Vpišite koordinate novega vozlišča."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Uporabi decimalne stopinje."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negativne vrednosti pomenijo zahodno/južno poloblo."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -446,5 +428,5 @@
 msgstr "Z. širina"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -453,27 +435,27 @@
 msgstr "Z. dolžina"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Razporedi vozliša v krog"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Premakne izbrana vozlišča tako, da tvorijo krog."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -483,5 +465,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -497,30 +479,28 @@
 msgstr "Orodje: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Prosim, izberite vsaj 4 vozlišča."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -530,84 +510,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Poravnaj vozlišča na premico"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Premakne izbrana vozlišča tako, da so na isti premici."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Prosim, izberite vsaj 3 vozlišča."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "podatke"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "plast"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "sprejem"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Povečava na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Povečava pogleda na {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Pogled: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -615,37 +595,37 @@
 msgstr "Datoteka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Združi poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Združi več poti v eno samo."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Obrnem smeri?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Obrni in združi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -653,5 +633,5 @@
 msgstr "Poti v trenutnih smereh ni mogoče združiti. Obrnem nekatere od njih?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -659,41 +639,41 @@
 msgstr "Poti se ne da združiti (Vozlišča niso povezana v premem zaporedju)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Združi {0} poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopiraj izbrane predmete v odložišče"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Izberite predmete, ki jih želite kopirati."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Ustvari krog"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Skozi izbrana tri vozlišča ustvari krog"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -701,16 +681,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -722,5 +700,5 @@
 msgstr "Izbriši"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Izbriši izbrane predmete."
@@ -728,6 +706,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -741,73 +719,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../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:30
+#: ../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:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Sprejem iz OSM ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Sprejmi podatke zemljevida s strežnika OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Sprejemanje"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "V redu"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -816,39 +771,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Podvoji"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Podvoji izbrano z zaporednima ukazoma kopiraj in prilepi."
@@ -858,41 +813,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Končaj"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Zaključek dela z aplikacijo."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Izvoz v GPX ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Izvoz v datoteko oblike GPX."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -931,6 +886,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -949,9 +904,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -971,5 +926,5 @@
 msgstr "parameter ''{0}'' ne sme biti ničen"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -977,36 +932,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Prikaz zgodovine poti, vozlišča ali relacije OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Informacije o elementu"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Priključi vozlišče k poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Vključi izbrano vozlišče v najbližji del poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Priključi vozlišče v pot"
@@ -1016,168 +971,186 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Združi vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Združi vozlišča v najstarejšega"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Izberite vsaj dve vozlišči za združitev"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Prekinjanje ..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "Ne morem združiti vozlišč: Moral bi izbrisati pot, ki je še v rabi."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Združi {0} vozlišč"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../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:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Zrcali"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Prezrcali izbrana vozlišča in poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Prosim, izberize vsaj eno vozlišče ali pot."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "gor"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Premakni predmete {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "dol"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "levo"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "desno"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Premakni {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Premakni predmete {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Predmetov ni možno prestaviti s tega sveta."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Nova"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Ustvari nov zemljevid."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Odpri ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Odpri datoteko."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Odpri mesto ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Odpri URL naslov."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Ločena plast"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Mesto vira sprejema"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Sprejem podatkov"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr ""
@@ -1187,18 +1160,18 @@
 msgstr "Premakne vozlišča tako, da so koti med njimi 90 ali 270 stopinj"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1207,9 +1180,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1218,36 +1191,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Prilepi"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Prilepi vsebino odložišča"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Prilepi oznake"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../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:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1256,5 +1230,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1263,59 +1237,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Nastavitve ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Odpri stran z nastavitvami za splošne nastavitve."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Nastavitve"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Ponovi"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Znova uveljavi zadnje razveljavljeno dejanje."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Preimenuj plast"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Hkrati preimenuj datoteko"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Obrni poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Obrni smer izbranih poti."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Izberite vsaj eno pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Obrni smer poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1323,10 +1297,10 @@
 msgstr "Shrani"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Shrani trenutne podatke"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1375,21 +1349,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Shrani kot..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Shrani trenutne podatke v novo datoteko"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1397,29 +1371,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Prikaži poročilo stanja"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Prikaži poročilo o stanju s podatki, ki so lahko koristni pri prijavi napak"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Pomoč: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Poročilo stanja"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Kopiraj na odložišče in zapri"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1428,18 +1402,18 @@
 msgstr "Zapri"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Razdeli pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Razdeli pot pri izbranem vozlišču."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1449,5 +1423,5 @@
 msgstr[3] "Izbrana vozlišča niso na sredini nobene poti."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1461,9 +1435,9 @@
 msgstr[3] "Izbrana vozlišča so del več poti. Prosim, izberite tudi pot."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "Izbrana vozlišča niso del iste poti."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1473,10 +1447,10 @@
 msgstr[3] "Izbrana pot ne vsebuje izbranih vozlišč."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Za razdelitev krožne poti izberite dve ali več vozlišč."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1503,70 +1477,70 @@
 msgstr "Razdeli pot {0} na {1} delov"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Riši črte med točkami GPS sledi."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Izberite bodisi:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* Eno vozlišče z oznakami"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Eno vozlišče, ki je del več poti, ali"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Eno vozlišče, ki je del več poti in eno izmed teh poti, ali"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
 msgstr "* Eno pot, ki ima eno ali več vozlišč, ki so del več poti, ali"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
 msgstr "* Eno pot in eno ali več njenih vozlišč, ki so del več poti."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1576,9 +1550,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1586,80 +1560,80 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Razmnoži {0} vozlišč v {1} vozlišč"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Izniči"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Izniči zadnje dejanje."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Počisti izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Odizberi vse predmete"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+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:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Posodobi izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Izbor je prazen"
@@ -1671,8 +1645,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1681,5 +1655,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1687,29 +1661,29 @@
 msgstr "Ni sprememb za pošiljanje."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Ni česa poslati. Najprej pridobite kakšne podatke."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1723,11 +1697,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1738,5 +1712,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1746,23 +1720,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Odpravljanje sporov"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1773,28 +1746,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1803,17 +1767,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Spremeni {0} predmetov"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1832,11 +1810,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Povečaj"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Zmanjšaj"
@@ -1916,21 +1894,17 @@
 msgstr "Počasneje naprej"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Sprejem podatkov GPS"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Surovi podatki GPS"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Sprejem podatkov"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1938,27 +1912,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "Podatki OpenStreetMap"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Sprejem {0} od {1} (še {2})"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Napake pri sprejemu"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Ime uporabnika."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Prezri"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1970,7 +1955,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Napake pri sprejemu"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Napake pri sprejemu"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1992,5 +1992,5 @@
 msgstr "Način: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2018,38 +2018,38 @@
 msgstr "izbrano"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 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:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Ustvari novo vozlišče."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Izberi vozlišče pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2060,14 +2060,14 @@
 msgstr[3] "Vstavi novo vozlišče v {0} poti."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 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:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Nadaljuj pot od zadnjega vozlišča."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Zaključi risanje."
@@ -2087,5 +2087,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb."
@@ -2096,5 +2096,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Za prenehanje vrtenja izpustite miškin gumb."
@@ -2154,5 +2154,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2161,5 +2161,5 @@
 "najbližjo točko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2169,4 +2169,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Povečava"
@@ -2184,5 +2185,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Išči..."
@@ -2281,42 +2281,48 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2326,51 +2332,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Iskanje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Začni iskanje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "Najdeno {0} zadetkov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr ""
@@ -2398,26 +2404,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2426,5 +2443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2519,4 +2536,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "V redu"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2534,8 +2567,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Spremeni {0} predmetov"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2618,5 +2651,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2652,4 +2685,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parameter ''{0}'' ne sme biti ničen"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2680,29 +2724,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr ""
@@ -2710,6 +2731,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2718,5 +2739,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2900,15 +2921,30 @@
 msgstr "Samodejno popravljanje oznak"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Privzeta vrednost je ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2917,5 +2953,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2924,5 +2960,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2931,5 +2967,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2938,5 +2974,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2944,5 +2980,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2951,5 +2987,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2958,5 +2994,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2965,5 +3001,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2972,19 +3008,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Nastavitve shranjene na {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Nastavitev ni bilo mogoče prenesti. Razlog: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -2993,5 +3052,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "NEZNANO"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3013,20 +3092,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "J"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "S"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "Z"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "V"
@@ -3037,4 +3116,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3102,14 +3195,14 @@
 msgstr "Opozorilo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3117,5 +3210,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3142,6 +3235,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3201,113 +3294,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
+#, java-format
+msgid "Deleted member ''{0}'' in relation."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
-#, java-format
-msgid "Deleted member ''{0}'' in relation."
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#, java-format
+msgid "Way ''{0}'' with less than two points."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+msgid "More than one \"from\" way found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
-#, java-format
-msgid "Way ''{0}'' with less than two points."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
-msgid "More than one \"from\" way found."
+msgid "More than one \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+msgid "More than one \"via\" found."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-msgid "More than one \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
-msgid "More than one \"via\" found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznana vloga ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3323,11 +3416,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "besedilo"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3343,5 +3435,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3354,5 +3445,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3385,5 +3475,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "ozadje"
@@ -3451,10 +3541,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3483,5 +3573,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "železnica"
@@ -3498,4 +3588,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3515,33 +3607,33 @@
 msgstr[3] "{0} člani"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3549,16 +3641,16 @@
 msgstr "Spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Neznan gostitelj"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3570,4 +3662,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+msgid "Click to close the dialog"
 msgstr ""
 
@@ -3632,74 +3728,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Uporabniško ime"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Geslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "uporaba"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Prikaži to pomoč"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Sprejmi pravokotno področje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Odpri datoteko (če .gpx, potem kot surov GPS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "Sprejmi pravokotno področje GPS podatkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Ponastavi nastavitve na privzete"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Nastavi jezik."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3708,9 +3804,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "primeri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3718,25 +3814,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Aktiviranje posodobljenih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Nalaganje zgodnjih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Privzete nastavitve"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Nalaganje vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3749,11 +3845,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3778,6 +3874,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3878,25 +3974,21 @@
 msgstr "(ni predmeta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "plasti ni na seznamu."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Napaka pri razčlenjevanju"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Datoteke ni mogoče najti"
+#: ../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
@@ -3917,5 +4009,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3944,26 +4036,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Spremeni {0} predmetov"
-msgstr[1] "Spremeni {0} predmet"
-msgstr[2] "Spremeni {0} predmeta"
-msgstr[3] "Spremeni {0} predmete"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Izbriši izbrane predmete."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "izbrisano"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relacija"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -3975,5 +4062,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4022,5 +4109,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4037,5 +4124,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4235,8 +4322,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4543,6 +4630,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4556,6 +4643,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4613,36 +4700,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4654,5 +4741,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr ""
@@ -4742,4 +4829,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4750,4 +4839,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4761,49 +4851,82 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Odpri seznam vseh relacij."
+
+#: ../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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4840,6 +4963,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4926,10 +5049,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -4996,5 +5116,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5039,4 +5160,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5062,6 +5184,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5072,22 +5194,22 @@
 msgstr[3] "Spremenili boste do {0} predmete."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Prazna vrednost izbriše ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<različno>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Sprememba vrednosti?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5098,69 +5220,73 @@
 msgstr[3] "Spremeni lastnosti do {0} predmetov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Izberite ključ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Izberite vrednost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Lastnosti/Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Lastnosti izbranih predmetov"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Latnosti: {0} / Članstva: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Lastnosti / Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Spremeni relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, 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/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr ""
@@ -5168,40 +5294,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relacije"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Odpri seznam vseh relacij."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Odpri urejevalnik za izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Izbriši izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Ustvari novo relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Izbriši izbrano relacijo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Izberite bodisi:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Izbriši izbrano relacijo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Sprejmi področje"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5228,5 +5374,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5238,14 +5384,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 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:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -5327,5 +5473,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5355,23 +5502,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5380,14 +5527,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5397,9 +5544,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5409,15 +5556,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5425,5 +5572,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5431,20 +5578,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5453,66 +5600,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Pomakni izbranega člana vrstico višje."
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Pomakni izbranega člana vrstico nižje."
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5521,9 +5668,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5532,41 +5679,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5576,17 +5723,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5597,13 +5744,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5617,14 +5764,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5674,57 +5821,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Zaznamki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Prosim, vnesite želene koordinate."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Ustvari površine"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Pomakni izbranega člana vrstico nižje."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Prosim, vnesite ime kraja."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Najprej izberite zaznamek."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Pomakni izbranega člana vrstico višje."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Pomakni izbranega člana vrstico višje."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
+msgid "max lat"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
+msgid "max lon"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
-msgid "max lat"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
-msgid "max lon"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5733,357 +5911,136 @@
 "Povezava na www.openstreetmap.org (za sprejem področja sem prilepite URL)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Pravokotno področje"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Viri in vrste podatkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "Podatki OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Razdeli pot pri izbranem vozlišču."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Surovi podatki GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Izbrana pot ne vsebuje izbranega vozlišča."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Sprejmi kot novo plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Sprejmi področje"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Sprejemanje"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Izbriši izbrano plast."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Področje za sprejem je preveliko; najbrž bo strežnik zahtevo zavrnil"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
 "Področje sprejema v redu, velikost bo verjetno sprejemljiva za strežnik"
 
-#. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Prosim, vpišite iskani niz"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Rezultata iskanja kraja se ne da prebrati s strežnika"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Pomakni izbranega člana vrstico višje."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Prosim izberite vrstico za urejanje."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
 msgid "Enter a place name to search for:"
 msgstr "Vnesite ime kraja, ki ga želite poiskati:"
 
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Kraji"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "vrsta"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "blizu"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "povečava"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "Nivo povečave"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x od"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "do"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y od"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Številke ploščic"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Vnesite ime kraja, ki ga želite poiskati:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Išči..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+msgid "Click to start searching for places"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6441,4 +6398,6 @@
 #. 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" />
@@ -6819,6 +6778,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6884,11 +6844,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6898,6 +6858,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6907,79 +6867,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Naziv"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Vrsta"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "blizu"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "Nivo povečave"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x od"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "do"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y od"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Številke ploščic"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7060,4 +7287,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7349,9 +7577,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Spremenjeni predmeti:"
+msgstr[1] "Spremenjeni predmeti:"
+msgstr[2] "Spremenjeni predmeti:"
+msgstr[3] "Spremenjeni predmeti:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7447,5 +7677,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7475,59 +7714,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Točka {0} x {1} nima časovne oznake"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Berem {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Ni moč najti slik z berljivo časovno oznako."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Berem {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Slike z geografskim položajem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Začetek GPS sledi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Konec GPS sledi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "trenutna razlika: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "razlika časovnih pasov: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7537,51 +7776,51 @@
 msgstr[3] "slike"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} znotraj sledi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Uskladi uro"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "Slike JPEG (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "V datoteki \"{0}\" manjka EXIF čas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Slika"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Uskladite čas z GPS napravo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Vpisanega časa ni bilo mogoče razpoznati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7589,30 +7828,30 @@
 msgstr "točka GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Riši povezave med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne riši povezav med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7620,5 +7859,5 @@
 msgstr "Prilagodi barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7627,5 +7866,5 @@
 msgstr "Privzeto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7634,43 +7873,43 @@
 msgstr "Izberite barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Uvozi zvok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Zvočne datoteke (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Uvozi slike"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7680,28 +7919,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Opis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7710,5 +7949,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7717,10 +7956,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Pretvori v podatkovno plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7728,11 +7967,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7742,29 +7981,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Sprejmi vse znotraj:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7775,13 +8014,9 @@
 "nadaljevati?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7789,5 +8024,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7795,23 +8030,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "izven sprejetega področja"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7820,39 +8055,61 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} izbrisan.)"
+msgstr[1] " ({0} izbrisan.)"
+msgstr[2] " ({0} izbrisan.)"
+msgstr[3] " ({0} izbrisan.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} je sestavljen iz:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} izbrisan.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8021,6 +8278,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8035,6 +8290,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8204,5 +8457,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8530,20 +8783,19 @@
 msgstr "Jezik"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8558,6 +8810,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Posodobi"
@@ -8708,68 +8959,102 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
 msgstr "Izbriši izbrani vir iz seznama."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Dodaj vozlišče v pot"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Osveži seznam izbora."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Izbriši izbrano relacijo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8949,5 +9234,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr ""
@@ -9014,16 +9299,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Skupina prednastavitev ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Skupina prednastavitev ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9031,5 +9316,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9140,5 +9425,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -9364,5 +9649,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9389,5 +9674,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9395,5 +9680,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9406,5 +9691,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9415,50 +9700,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Napačno uporabniško ime ali geslo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Pozor: Geslo se prenaša nekriptirano"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Shrani uporabniško ime in geslo (nekriptirano)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Vnesite geslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Osnovni URL naslov strežnika"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM geslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9555,5 +9840,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9562,38 +9847,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9601,19 +9886,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "predmet z id=0 ni dovoljen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9622,7 +9907,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9632,25 +9921,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9658,5 +9947,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9665,5 +9954,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9671,5 +9960,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9678,13 +9967,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Priprava podatkov OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9695,14 +9984,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Sprejem iz OSM ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9815,15 +10103,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Posodobitev vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9836,29 +10124,35 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
+msgstr[0] "{0} vsavkov uspešno posodobljenih. Ponovno zaženite JOSM."
+msgstr[1] "{0} vsavek uspešno posodobljen. Ponovno zaženite JOSM."
+msgstr[2] "{0} vsavka uspešno posodobljena. Ponovno zaženite JOSM."
+msgstr[3] "{0} vsavki uspešno posodobljeni. Ponovno zaženite JOSM."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9870,10 +10164,10 @@
 msgstr "V vstavku {0} je prišlo do napake"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9883,49 +10177,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Zadnja posodobitev vstavkov pred več kot {0} dnevi."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Posodobitev vstavkov"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Vstavka {0} ni bilo mogoče najti."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Zadnja posodobitev vstavkov pred več kot {0} dnevi."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Število dni, po katerih se pojavi to opozorilo lahko nastavite<br>v "
-"možnosti 'pluginmanager.warntime' v nastavitvah.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Vstavka {0} ni bilo mogoče naložiti. Ga izbrišem iz nastavitev?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Onemogoči vstavek"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9935,9 +10238,9 @@
 "prepisati obstoječe datoteke."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9946,10 +10249,10 @@
 "Prišlo je do nepričakovane napake, ki verjetno izvira iz vstavka ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Glede na podatke znotraj vstavka je avtor {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9957,9 +10260,9 @@
 "Preden prijavite napako poskusite posodobiti vstavek na najnovejšo različico."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Naj vstavek onemogočim?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9969,22 +10272,22 @@
 "njegovo odstranitev iz spomina."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "opis ni na voljo"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9995,18 +10298,18 @@
 msgstr[3] "Sprejeti podatki o vstavkih z  {0} strežnikov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Informacij o vsavku ni bilo mogoče najti."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Vsi nameščeni vstavki so posodobljeni."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10019,9 +10322,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Sprejem manjkajočih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10036,9 +10339,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10060,19 +10363,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "neznan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Različica {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10135,5 +10438,5 @@
 msgstr "(besedilo je že bilo prekopirano na odložišče.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10142,5 +10445,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10149,5 +10452,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10157,5 +10460,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10165,10 +10468,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10177,5 +10480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10184,16 +10487,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10203,5 +10506,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10210,5 +10513,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10217,5 +10520,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10224,10 +10527,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10236,10 +10539,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10250,5 +10553,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10258,5 +10561,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10267,5 +10570,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10360,11 +10663,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10507,5 +10803,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -10521,10 +10818,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10532,103 +10829,103 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10678,46 +10975,47 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
-msgstr ""
-
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
+msgstr "Pomakni izbrano plast vrstico višje."
+
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -10969,5 +11267,5 @@
 msgstr "Napaka v datoteki {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -10980,10 +11278,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11031,13 +11329,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11046,13 +11344,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11160,7 +11458,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Oblika prikaza koordinat"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11178,5 +11475,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11217,13 +11514,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11354,22 +11651,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11377,5 +11674,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11389,9 +11686,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11411,9 +11708,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "Prilagodi položaj plasti WMS"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11435,5 +11731,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Prazna plast"
@@ -11462,5 +11758,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11469,18 +11765,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11575,5 +11871,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Ni naloženih podatkov."
@@ -11979,7 +12275,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr ""
@@ -12181,33 +12477,33 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Zajemi GPS sled"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Povezava s strežnikom gpsd in prikaz trenutnega položaja na plasti LiveGPS."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Centriraj zdaj"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centiraj plast LiveGPS na trenuten položaj."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Samodejno centriraj"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Nenehno centriraj plast LiveGPS na trenutni položaj."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr ""
@@ -12296,24 +12592,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12457,4 +12753,9 @@
 msgstr ""
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Plast"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12500,30 +12801,30 @@
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
+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:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
+msgid "Confirm Remote Control action"
+msgstr ""
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
+msgid "Remote Control has been asked to create a new node."
+msgstr ""
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
-msgid "Do you want to allow this?"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
-msgid "Confirm Remote Control action"
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-msgid "Remote Control has been asked to create a new node."
-msgstr ""
-
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr ""
@@ -12542,7 +12843,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12551,4 +12850,5 @@
 #: ../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 ""
@@ -12570,25 +12870,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12618,93 +12918,87 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Povečava"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Naloži ploščico"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
 msgstr "Prikaži stanje ploščice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Zahtevaj posodobitev"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Naloži vse ploščice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Viri ploščic"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Nivo povečave"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "napaka pri oddaji zahtevka za pososobitev"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -12717,5 +13011,5 @@
 msgstr "Vsako minuto shrani zajete podatke v datoteko."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12877,5 +13171,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Ime ceste"
@@ -12919,29 +13213,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -12949,33 +13243,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Razreši neskladja"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13180,8 +13474,4 @@
 msgstr "Popravi izbrane napake"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Prezri"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13226,23 +13516,22 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
-msgid "Unconnected coastline"
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
+msgid "Unconnceted coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr "Obrni in združi"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
-msgid "Unordered coastline"
 msgstr ""
 
@@ -13265,18 +13554,18 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Podvojena vozlišča"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13517,4 +13806,8 @@
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Izbriši izbrani vir iz seznama."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13729,7 +14022,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "zgradba"
@@ -13743,5 +14036,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr ""
@@ -13751,25 +14044,25 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr ""
@@ -13861,21 +14154,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14108,9 +14406,9 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Odpri prazno plast WMS za nalaganje podatkov iz datoteke"
@@ -14556,6 +14854,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr ""
@@ -15117,5 +15415,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15127,5 +15425,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr ""
@@ -15413,7 +15711,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "da"
@@ -15562,8 +15860,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr ""
@@ -15690,31 +15988,4 @@
 msgstr ""
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Vrsta"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15835,5 +16106,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr ""
@@ -15868,5 +16139,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr ""
@@ -15901,5 +16172,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr ""
@@ -16289,12 +16560,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr ""
@@ -16507,6 +16778,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr ""
@@ -16933,5 +17204,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr ""
@@ -17464,25 +17735,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr ""
@@ -17548,24 +17819,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17578,24 +17849,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17608,24 +17879,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17658,6 +17929,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr ""
@@ -17673,5 +17944,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
@@ -17685,5 +17956,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr ""
@@ -17919,5 +18190,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr ""
@@ -18385,5 +18656,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Kolesarjenje"
@@ -18398,5 +18669,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Smučanje"
@@ -18550,16 +18821,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Arheološko najdišče"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Uredi arheološko najdišče"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr ""
@@ -18567,55 +18851,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Igrišče"
@@ -18623,35 +18907,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -18665,6 +18949,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "izberite šport:"
@@ -19056,30 +19340,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "šport"
@@ -19089,227 +19373,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "lokostrelstvo"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "košarka"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "plezanje"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "kolesarjenje"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gimnastika"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "strelišče"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "smučanje"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "nogomet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "plavanje"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "namizni_tenis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golf igrišče"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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 "vrsta"
 
 #. item "Sport/Multi" combo "type"
@@ -19346,203 +19683,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadion"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Lokostrelstvo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Konjske dirke"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Plavanje"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
@@ -19550,56 +19887,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Uredi smučanje"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Strelišče"
@@ -19607,182 +19944,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Uredi strelišče"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_igrišče"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Zgradbe"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Zgradba"
@@ -19790,5 +20127,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -19796,10 +20133,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Uredi javno zgradbo"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -19807,10 +20144,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Uredi mestno hišo"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -19818,10 +20155,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Uredi veleposlaništvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -19830,10 +20167,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Uredi sodišče"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Zapor"
@@ -19842,10 +20179,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Uredi zapor"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Policijska postaja"
@@ -19855,10 +20192,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Uredi policijsko postajo"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -19867,10 +20204,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Uredi gasilski dom"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Pošta"
@@ -19878,5 +20215,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Uredi pošto"
@@ -19884,15 +20221,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Šola"
@@ -19900,10 +20237,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Uredi šolo"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr ""
@@ -19911,10 +20248,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr ""
@@ -19922,5 +20259,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr ""
@@ -19928,5 +20265,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -19935,10 +20272,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Uredi kinematograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Knjižnica"
@@ -19947,9 +20284,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Uredi knjižnico"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr ""
@@ -19957,10 +20294,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Gledališče"
@@ -19969,10 +20306,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Uredi gledališče"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -19982,5 +20319,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Uredi kraj čaščenja"
@@ -19989,6 +20326,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Vera"
@@ -19997,66 +20334,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr ""
@@ -20065,81 +20402,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Naslovi"
@@ -20148,5 +20485,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Urejanje podatkov o naslovu"
@@ -20154,5 +20491,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr ""
@@ -20160,20 +20497,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Poštna številka"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr ""
@@ -20182,5 +20519,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Uredi interpolacijo naslovov"
@@ -20188,61 +20525,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Stolp"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20250,25 +20587,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -20276,10 +20613,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -20287,10 +20624,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -20299,37 +20636,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Uredi cevovod"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -20339,10 +20676,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Žerjav"
@@ -20350,10 +20687,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Uredi žerjav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -20361,10 +20698,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -20372,10 +20709,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -20383,5 +20720,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Uredi video nadzorno kamero"
@@ -20389,5 +20726,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr ""
@@ -20397,35 +20734,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr ""
@@ -20434,10 +20771,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr ""
@@ -20446,5 +20783,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -20452,10 +20789,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Steber daljnovoda"
@@ -20466,23 +20803,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Uredi steber daljnovoda"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr ""
@@ -20491,75 +20828,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Stranišča"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefon"
@@ -20568,5 +20905,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Uredi telefon"
@@ -20574,5 +20911,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Kovanci"
@@ -20580,5 +20917,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Bankovci"
@@ -20586,5 +20923,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -20592,5 +20929,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Debetne kartice"
@@ -20598,15 +20935,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -20615,5 +20952,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Uredi raciklažno točko"
@@ -20621,35 +20958,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Klopca"
@@ -20658,31 +20995,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20753,39 +21090,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -20794,30 +21131,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr ""
@@ -20826,10 +21163,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -20838,10 +21175,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -20849,33 +21186,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr ""
@@ -20883,9 +21220,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr ""
@@ -20893,27 +21230,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -20921,5 +21258,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Uredi prodajni avtomat"
@@ -20927,88 +21264,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Mesar"
@@ -21016,9 +21353,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Uredi mesarja"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Pekarna"
@@ -21026,9 +21363,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Uredi pekarno"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr ""
@@ -21036,18 +21373,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21055,54 +21392,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr ""
@@ -21110,9 +21447,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21120,9 +21457,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Sam svoj mojster"
@@ -21130,54 +21467,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Uredi sam svoj mojster trgovino"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Čistilnica"
@@ -21185,9 +21522,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Uredi čistilnico"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Pralnica"
@@ -21195,9 +21532,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Uredi pralnico"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr ""
@@ -21205,28 +21542,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Banka"
@@ -21234,14 +21571,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Uredi banko"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -21249,5 +21586,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Uredi menjalnico"
@@ -21255,15 +21592,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr ""
@@ -21271,18 +21608,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -21290,5 +21627,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Uredi lekarno"
@@ -21296,9 +21633,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -21306,10 +21643,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr ""
@@ -21318,5 +21655,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -21325,20 +21662,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -21346,5 +21683,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr ""
@@ -21353,59 +21690,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Kraji"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Uredi kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Država"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Uredi državo"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr ""
@@ -21413,15 +21755,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr ""
@@ -21429,10 +21771,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr ""
@@ -21440,25 +21782,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Vas"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Uredi vas"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Zaselek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
@@ -21466,5 +21808,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr ""
@@ -21472,10 +21814,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Otok"
@@ -21483,10 +21825,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Uredi otok"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21494,5 +21836,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21500,5 +21842,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr ""
@@ -21506,10 +21848,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Vrh"
@@ -21517,10 +21859,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Uredi vrh"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr ""
@@ -21528,10 +21870,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr ""
@@ -21539,70 +21881,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Meje"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Drevo"
@@ -21611,15 +21953,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Uredi drevo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr ""
@@ -21628,5 +21970,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr ""
@@ -21634,17 +21976,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Gozd"
@@ -21653,14 +21995,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Uredi gozdnata tla"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Naravni rezervat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Uredi naravni rezervat"
@@ -21668,25 +22010,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr ""
@@ -21694,10 +22036,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr ""
@@ -21705,5 +22047,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr ""
@@ -21711,5 +22053,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr ""
@@ -21718,45 +22060,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -21764,25 +22106,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21790,10 +22132,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr ""
@@ -21801,20 +22143,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr ""
@@ -21822,5 +22164,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -21828,15 +22170,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -21844,9 +22186,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Uredi pokopališče"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr ""
@@ -21854,39 +22196,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -21894,15 +22236,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr ""
@@ -21910,55 +22252,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr ""
@@ -21968,5 +22310,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr ""
@@ -21975,10 +22317,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr ""
@@ -21986,5 +22328,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr ""
@@ -21993,5 +22335,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -21999,34 +22341,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr ""
@@ -22035,15 +22377,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr ""
@@ -22051,5 +22393,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22058,5 +22400,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22064,5 +22406,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22134,5 +22476,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22141,17 +22483,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22204,5 +22546,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22211,13 +22553,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr ""
@@ -22231,10 +22573,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr ""
@@ -22242,31 +22584,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr ""
@@ -22275,30 +22617,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22736,11 +23078,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr ""
@@ -24764,5 +25106,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25434,4 +25776,12 @@
 #.
 #. <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"/>
@@ -25456,5 +25806,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr ""
@@ -25468,5 +25818,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr ""
@@ -25480,5 +25830,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr ""
@@ -25500,5 +25850,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr ""
@@ -25512,5 +25862,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr ""
@@ -25524,5 +25874,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr ""
@@ -25545,5 +25895,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr ""
@@ -25557,5 +25907,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr ""
@@ -25569,5 +25919,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25581,5 +25931,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25593,5 +25943,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25648,7 +25998,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr ""
@@ -25662,5 +26012,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr ""
@@ -25673,5 +26023,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr ""
@@ -25686,5 +26036,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr ""
@@ -25698,5 +26048,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr ""
@@ -25751,8 +26101,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr ""
@@ -25766,5 +26116,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr ""
@@ -25778,5 +26128,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr ""
@@ -25790,5 +26140,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3383
 msgid "woodarea"
 msgstr ""
@@ -25802,5 +26152,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr ""
@@ -25814,5 +26164,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr ""
@@ -25890,8 +26240,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr ""
@@ -25939,7 +26289,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr ""
@@ -26089,11 +26439,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr ""
@@ -26141,6 +26491,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr ""
@@ -26448,12 +26798,40 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Napaka pri nalaganju strani {0}"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Uporabi prednastavitev ''{0}''"
+#~ msgid "File could not be found."
+#~ msgstr "Datoteke ni bilo moč najti."
+
+#~ msgid "Error while parsing"
+#~ msgstr "Napaka pri razčlenjevanju"
+
+#~ msgid "File not found"
+#~ msgstr "Datoteke ni mogoče najti"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Prosim, vnesite želene koordinate."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Najprej izberite zaznamek."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Prosim, vpišite iskani niz"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Rezultata iskanja kraja se ne da prebrati s strežnika"
+
+#~ msgid "zoom"
+#~ msgstr "povečava"
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Število dni, po katerih se pojavi to opozorilo lahko nastavite<br>v "
+#~ "možnosti 'pluginmanager.warntime' v nastavitvah.)"
+
+#~ msgid "Request Update"
+#~ msgstr "Zahtevaj posodobitev"
+
+#~ msgid "error requesting update"
+#~ msgstr "napaka pri oddaji zahtevka za pososobitev"
 
 #~ msgid "Move"
@@ -26465,7 +26843,4 @@
 #~ msgid "No data imported."
 #~ msgstr "Nič podatkov ni bilo uvoženih."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Osveži seznam izbora."
 
 #~ msgid "Cannot open preferences directory: {0}"
@@ -26497,7 +26872,4 @@
 #~ msgstr "OSM uporabniško ime (email)"
 
-#~ msgid "Aborting..."
-#~ msgstr "Prekinjanje ..."
-
 #~ msgid "position"
 #~ msgstr "položaj"
@@ -26531,11 +26903,4 @@
 #~ msgid "Unknown file extension."
 #~ msgstr "Neznana končnica datoteke."
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} vsavkov uspešno posodobljenih. Ponovno zaženite JOSM."
-#~ msgstr[1] "{0} vsavek uspešno posodobljen. Ponovno zaženite JOSM."
-#~ msgstr[2] "{0} vsavka uspešno posodobljena. Ponovno zaženite JOSM."
-#~ msgstr[3] "{0} vsavki uspešno posodobljeni. Ponovno zaženite JOSM."
 
 #~ msgid "Could not download plugin: {0} from {1}"
@@ -26621,4 +26986,10 @@
 #~ msgstr "Oprostite, to ne deluje z anonimnimi uporabniki"
 
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Uporabi prednastavitev ''{0}''"
+
 #~ msgid "Tagging preset source"
 #~ msgstr "Vir prednastavljenih oznak"
@@ -26642,4 +27013,7 @@
 #~ msgstr "Vse poti so bile prazne"
 
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Napaka pri nalaganju strani {0}"
+
 #~ msgid "Open in Browser"
 #~ msgstr "Odpri v brskalniku"
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 18273)
+++ applications/editors/josm/i18n/po/sv.po	(revision 18508)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-02 22:04+0000\n"
-"Last-Translator: Erik Iohansson <erjohan@gmail.com>\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-11-05 17:19+0000\n"
+"Last-Translator: Gustav Arnesson <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,67 +16,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:05+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Skapar huvudgränssnittet"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Hoppar över felaktig URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -89,12 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -104,27 +98,26 @@
 msgstr "Varning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Hoppar över felaktig URL till en fil: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr "<html>Kunde inte läsa filen ''{0}''.<br> Felet är: <br>{1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -132,23 +125,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -156,5 +150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -163,21 +157,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -186,5 +181,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -197,17 +192,9 @@
 msgstr "Fel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "OKÄND"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Om"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Visa om-skärmen"
@@ -215,37 +202,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap-redigeraren"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Senast ändrad {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Javaversion {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Buggrapporter"
@@ -255,5 +242,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -261,33 +248,29 @@
 msgstr "Information"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Läsmig"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Utgåva"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Bidrag"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Licens"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "Om JOSM..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Filen kunde inte hittas."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -319,45 +302,44 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
 msgid "Continue"
-msgstr ""
+msgstr "Fortsätt"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -365,5 +347,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -376,19 +358,19 @@
 msgstr "Välj åtminstonde en redan upladdad nod, väg eller relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr "Välj ett mål lager."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr "Välj ett mål lager."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Sammanfoga"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -399,50 +381,50 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr "Inga mål lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Lägg till nod..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Lägg till en nod genom att ange latitud och longitud."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Redigera: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Ange den nya nodens koordinater."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Använd decimalgrader."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negativa värden avser västra/södra halvklotet."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -451,5 +433,5 @@
 msgstr "Latitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -458,27 +440,27 @@
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Bilda en cirkel av noderna"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Flytta de valda noderna in i en cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -488,5 +470,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -502,30 +484,28 @@
 msgstr "Verktyg: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "Välj åtminstone fyra noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -535,84 +515,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Placera noderna i en rak linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Flytta de valda noderna in i en linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "Välj åtminstone tre noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "urval"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "nedhämtad data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zooma till {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zooma det visade till  {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Visa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Det finns inte något valt att zooma till"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Det finns inte några konflikter att zooma till"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr "Avsluta påbörjade  changesets"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr "Avslutar påbörjade changesets"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -620,37 +600,37 @@
 msgstr "Arkiv: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr "Inga changesets är påbörjade"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr "Inga påbörjade changesets"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr "Laddar ner påbörjade changesets..."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Slå ihop sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Förena flera sträckor till en enda."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Ändra riktning?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Byt riktning och slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -660,5 +640,5 @@
 "några av dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -668,41 +648,41 @@
 "noder av dem)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Slå ihop {0} sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Välj åtminstone två sträckor att slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopiera"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopiera valda objekt till inklistringsbuffern."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Välj någonting att kopiera."
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Skapa cirkel"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Skapa en cirkel av tre valda noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Noderna är inte i en cirkel. Avbryter."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -712,16 +692,14 @@
 "precis två eller tre noder."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -733,5 +711,5 @@
 msgstr "Ta bort"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Ta bort valda objekt."
@@ -739,6 +717,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -752,74 +730,51 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Distribuera noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Distribuera de valda noderna på jämna avstånd längs en linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "Hämta från OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Hämta kartdata från OSM-servern."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "Hämta"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Välj åtminstone en uppgift att hämta"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 "Laddar ner de primitiva som refererar till en av dem markerade primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -828,39 +783,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "{0} konflikter uppstod under import."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "Konflikter under nerladdningen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
-msgstr "({0}/{1}) Laddar föräldrar till primitiv {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
+#, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
-msgstr "({0}/{1}) Laddar föräldrar till primitiv {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
+#, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) Laddar föräldrar till primitiv {2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Duplicera"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicera det valda genom att kopiera och omedelbart klistra in."
@@ -870,41 +825,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Avsluta"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Avsluta programmet."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr "Alla format"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "Exportera till GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Exportera data till en GPX-fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Det finns inte något att exportera. Skaffa lite data först."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -943,6 +898,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -961,9 +916,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -983,5 +938,5 @@
 msgstr "parametern ''{0}'' får inte vara null"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -989,36 +944,36 @@
 msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "Exportera till GPX fil"
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+msgstr "Objekt historik"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr "Visa historik om OSM vägar, noder eller relationer."
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Information om element"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr "Visa objektinformation om OSM noder, vägar eller relationer."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Anslut nod till sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Anslut en nod till det närmaste avsnittet av en sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Förena nod och linje"
@@ -1028,170 +983,188 @@
 msgstr "Inget kortkommando"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Sammanfoga lagren"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Sammafoga det nuvarande lagret med ett annat"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Slå ihop noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Slå ihop noder med den äldsta."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Välj åtminstone två noder att slå ihop."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "Avbryter..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Det går inte att slå ihop noderna: En väg som fortfarande används skulle "
 "behöva tas bort."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Slå ihop {0} noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Sammanfoga markeringen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Sammanfoga de markerade primitiva med ett annat lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
 msgid "Mirror"
 msgstr "Spegel"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "Spegla markerade noder och sträckor."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "Markera minst en nod eller sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "upp"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Flytta objekt {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "ned"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "vänster"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "höger"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Flytta {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Flytta objekt {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Kan inte flytta objekt utanför världen."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Ny"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Skapa ny karta"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Öppna..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Öppna en fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr "Öppnar filer"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr "Öppnar fil ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Öppna plats..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Öppna en URL."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "Skilda lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+msgstr "Välj om datan ska hämtas som ett nytt lager"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "Ange URL att hämta:"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Hämta plats"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "Hämta URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Hämtar data"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Räta upp form"
@@ -1201,18 +1174,18 @@
 msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1221,9 +1194,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1235,32 +1208,33 @@
 "denna varning.<br>Vill du fortsätta?</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+msgstr "Användning"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Räta upp"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Klistra in"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Klistra in innehållet i inklistringsbuffern"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Klistra in taggar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
@@ -1268,5 +1242,5 @@
 "föremål."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1275,5 +1249,5 @@
 msgstr[1] "Klistrar in {0} tagar"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1282,59 +1256,59 @@
 msgstr[1] "till {0} primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Inställningar..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Öppna en inställningssida för globala inställningar."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Återställ"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Gör om den senaste ogjorda handlingen."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Byt namn på lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Byt också namn på filen"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Kunde inte döpa om filen ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Ändra riktning på sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Ändra riktningen på alla valda sträckor."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Välj åtminstone en sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Ändra riktning på sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1342,10 +1316,10 @@
 msgstr "Spara"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Spara nuvarande data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1396,21 +1370,21 @@
 msgstr "Spara Lager"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Spara som..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Spara nuvarande data i en ny fil."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Välj allt"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1420,29 +1394,29 @@
 "ofullständiga objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "Visa statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
 "Visa statusrapport med information som kan vara av nytta vid felrapportering."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "Hjälp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "Kopiera till urklipp och stäng"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1451,18 +1425,18 @@
 msgstr "Stäng"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Dela sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Dela sträckan vid vald nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Det går inte att dela baserat på nuvarande urval."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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."
@@ -1470,5 +1444,5 @@
 msgstr[1] "De valda noderna ligger inte inuti någon sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1484,9 +1458,9 @@
 "sträckan."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "De valda noderna ingår inte i samma sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1494,10 +1468,10 @@
 msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Du måste välja två eller fler noder för att dela en sluten sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1524,61 +1498,61 @@
 msgstr "Dela sträcka {0} i {1} delar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "Alternera gpx-linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "Rita linjer mellan råa gps-punkter."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Byter läge för den globala inställningen ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Frigör sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Duplicera noder som används av flera olika sträckor."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Denna nod är inte bunden till något annat."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Ingen av dessa noder hänger ihop med någonting annat."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Ingen av noderna på denna sträcka är knuten till något annat."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Det nuvarande urvalet kan inte användas för att frigöra något."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Välj antingen:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* En nod med tagg, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* En nod som används av mer än en sträcka, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* En nod som används av mer än en sträcka samt en av dessa sträckor, eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1587,5 +1561,5 @@
 "eller"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1594,5 +1568,5 @@
 "sträcka."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1607,9 +1581,9 @@
 "få sina egna kopior och alla noder kommer att vara valda."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "Frigjord nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1617,80 +1591,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "Duplicera {0} noder till {1} noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Ångra"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Ångra senaste åtgärden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Avmarkera alla"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Avmarkera alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Avmarkera allt (fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Avmarkera allt (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+msgstr "Uppdatera data"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Rita gränser för data hämtade från servern."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr "Laddar up data"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr "Inget dataset kunde hittas"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "Uppdatera markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr "Det finns inga markerade primitiv att uppdatera."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "Tom markering"
@@ -1702,8 +1677,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1712,5 +1687,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1718,29 +1693,29 @@
 msgstr "Det finns inte några ändringar att skicka in."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Det finns inte någonting att skicka in. Skaffa lite data först."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "Synkronisera hela datasetet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1754,11 +1729,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1774,5 +1749,5 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1782,23 +1757,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "Relationskonflikt"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1809,29 +1783,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
-"Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr "<html>Uppladdning <strong>misslyckades</strong>.<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "Uppladningen till OSM API misslyckades"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr "Uppdaterar primitiv"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1840,17 +1804,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Ändra {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1869,11 +1847,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "Zooma in"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Zooma ut"
@@ -1953,21 +1931,17 @@
 msgstr "Långsammare framåt"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "Hämtar GPS-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "Hämtade GPX-data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Rå GPS-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Hämtar data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1975,27 +1949,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap-data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Laddar ner {0} av {1} ({2} kvar)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "Fel under nedladdning"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Laddar up data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Användarnamn"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Ignorera"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -2012,7 +1997,22 @@
 "<br>Klicka på <strong>{2}</strong> för att ignorera.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr "Raderade eller flyttade primitiv"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Följande fel uppstod vid massnedladdning:"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "Fel under nedladdning"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "Fel under nedladdning"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -2034,5 +2034,5 @@
 msgstr "Läge: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2062,38 +2062,38 @@
 msgstr "markerad"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 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:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "Skapa ny nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "Markera nod under pekare."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2102,14 +2102,14 @@
 msgstr[1] "Infoga ny nod i {0} vägar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 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:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "Fortsätt väg från senaste nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "Avsluta ritning."
@@ -2129,5 +2129,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Släpp musknappen för att välja objekten i rektangeln."
@@ -2138,5 +2138,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Släpp musknappen för att sluta rotera."
@@ -2198,5 +2198,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2205,5 +2205,5 @@
 "nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2215,4 +2215,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zooma:"
@@ -2232,5 +2233,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Sök..."
@@ -2335,34 +2335,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>nodes:</b>... - objekt med givent antal noder"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alla ändrade objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alla valda objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alla ofullständiga objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>otaggade</b> - alla otaggede objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Använd <b>|</b> eller <b>OR</b> för att kombinera med logiskt ELLER"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2370,9 +2377,9 @@
 "innehåller :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Använd <b>(</b> och <b>)</b> för att gruppera uttryck"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2382,51 +2389,51 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Sök"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "Påbörja sökning"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Inga sökträffar för ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Urvalet utökades inte genom att söka efter ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Urvalet begränsades inte genom att söka efter ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} sökträffar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2458,26 +2465,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "Det saknas argument för eller (or)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "Det saknas argument för inte (not)."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "En avslutande parentes förväntades"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "Felaktigt antal parametrar för nodoperator."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Felaktigt antal parametrar för nodoperator."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2486,5 +2505,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2586,4 +2605,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2601,8 +2636,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "Ändra {0} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2683,5 +2718,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2717,4 +2752,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parametern ''{0}'' får inte vara null"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2745,29 +2791,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "Relationskonflikt"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "Ta bort från relation"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Dela delsträcka"
@@ -2775,6 +2798,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2786,5 +2809,5 @@
 "använder dem.<br> Vill du verkligen ta bort dem?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2972,15 +2995,30 @@
 msgstr "Automatisk taggrättning"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Nuvarande värde är ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Fel i konfigurationsfilen på raderna {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2989,5 +3027,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2996,5 +3034,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -3003,5 +3041,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -3010,5 +3048,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -3016,5 +3054,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -3023,5 +3061,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -3030,5 +3068,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -3037,5 +3075,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -3044,19 +3082,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Inställningar lagrade på {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Kunde inte skicka in inställningar. Orsak: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Kunde inte hämta inställningar från server."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3065,5 +3126,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "OKÄND"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3085,20 +3166,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "S"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "N"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "V"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "Ö"
@@ -3109,4 +3190,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3174,14 +3269,14 @@
 msgstr "Varning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3189,5 +3284,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3214,6 +3309,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3273,113 +3368,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "En sträcka för en yta är inte sluten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Multipolygonsträckan ''{0}'' är inte sluten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Tog bort medlemmen ''{0}'' i relationen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Sträcka \"{0} med mindre än två punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "Det finns mer än en \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "Det finns mer än en \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "Mer än en \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Okänd roll ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Okänd medlemstyp för ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "Det finns inte någon \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "Det finns inte någon \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "Ingen nod eller sträcka för \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stil för restriktion {0} kunde inte hittas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Den inre sträckan ''{0}'' befinner sig utanför."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Icke-sträcka ''{0}'' i multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygonen ''{0}'' saknar yttre sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Den inre sträckan ''{0}'' befinner sig utanför."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3395,11 +3490,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "text"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3415,5 +3509,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3424,5 +3517,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3451,5 +3543,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "bakgrund"
@@ -3483,12 +3575,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambertzon (Frankrike)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambertzon (Frankrike)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3524,10 +3614,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3556,5 +3646,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "järnväg"
@@ -3571,4 +3661,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3584,33 +3676,33 @@
 msgstr[1] "{0} medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr "Brott mot förhandsvillkor"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3618,16 +3710,16 @@
 msgstr "Konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Okänd värddator"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3640,4 +3732,8 @@
 msgid "Downloading \"Message of the day\""
 msgstr "Hämtar \"Dagens meddelande\""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+msgid "Click to close the dialog"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3707,74 +3803,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "Användarnamn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "användning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "alternativ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Visa denna hjälptext"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Standard unix-geometri-argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Hämta hem området inom gränsvärdena"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Öppna fil (som rå gps, om .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 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:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Gör urval med angivet sökkriterium"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "Öppna i maximerat läge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Återställ inställningarna till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Ange språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3783,9 +3879,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "exempel"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3795,25 +3891,25 @@
 "data innan --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Istället för --download=<bbox> kan du använda osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Aktiverar uppdaterade insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Hämtar tidiga insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Anger förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Hämtar insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3826,11 +3922,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3855,6 +3951,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3955,25 +4051,22 @@
 msgstr "(inget objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "lagret finns inte i listan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Fel vid tolkning"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Filen hittades inte"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "Nej, avbryt"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3994,5 +4087,5 @@
 msgstr "ej angiven: ange inte denna egenskap för valda objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -4021,24 +4114,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "Ändra {0} objekt"
-msgstr[1] "Ändra {0} objekt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Ta bort valda objekt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "raderad"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "Relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -4050,5 +4140,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4097,5 +4187,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4112,5 +4202,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4310,8 +4400,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4620,6 +4710,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4633,6 +4723,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4690,36 +4780,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4731,5 +4821,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "alla"
@@ -4819,4 +4909,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4827,4 +4919,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4838,49 +4931,84 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+#, fuzzy
+msgid "Keep"
+msgstr "Behåll mina"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Ange värden för alla konflikter"
+
+#: ../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 ""
+
+#: ../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:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+#, fuzzy
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Uppladdning <strong>misslyckades</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4917,6 +5045,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -5004,10 +5132,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5074,5 +5199,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5117,4 +5243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5140,6 +5267,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5148,22 +5275,22 @@
 msgstr[1] "Detta kommer att ändra upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Om värdet är tomt tas nyckeln bort."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<olika>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Ändra värden?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5172,69 +5299,73 @@
 msgstr[1] "Ändra egenskaper för upp till {0} objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Välj en nyckel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Välj ett värde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Välj de objekt vars egenskaper du vill ändra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Egenskaper/Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Egenskaper för valda objekt."
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Medlem av"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Lägg till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Redigera egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "Ändra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "Ta bort från relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, 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/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 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/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Ta bort egenskaper"
@@ -5242,40 +5373,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "Relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "Öppna en lista över alla relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Öppna en redigerare för den valda relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Ta bort den valda relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Skapa en ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Ta bort den valda relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Välj antingen:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Ta bort den valda relationen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Hämta medlemmar"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5302,5 +5453,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5312,9 +5463,9 @@
 msgstr "Urval: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Lossa panelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5323,5 +5474,5 @@
 "vänstra verktygraden."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicka för att minimera/maximera panelens innehåll"
@@ -5403,5 +5554,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5431,23 +5583,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5456,14 +5608,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5473,9 +5625,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5485,15 +5637,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5501,5 +5653,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5507,20 +5659,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5529,66 +5681,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Flytta vald medlem/valda medlemmar uppåt"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Flytta vald medlem/valda medlemmar nedåt"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5597,9 +5749,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5608,41 +5760,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hämta alla ofullständiga sträckor och noder i relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Hämta medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5652,17 +5804,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5673,13 +5825,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5693,14 +5845,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5750,58 +5902,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Inte ansluten"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Bokmärken"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "Ange först önskade koordinater."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Skapa gräns"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Flytta vald medlem/valda medlemmar nedåt"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Ange platsens namn."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "Välj ett bokmärke först."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Flytta vald medlem/valda medlemmar uppåt"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Flytta vald medlem/valda medlemmar uppåt"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5811,357 +5993,137 @@
 "hem området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Gränsvärden"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Datakällor och -typer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap-data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Dela sträckan vid vald nod."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Rå GPS-data"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Den valda sträckan innehåller inte den valda noden."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Hämta som ett nytt lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Hämta område"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "Hämta"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "Inget GPX-spår har valts"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Hämtningsområdet är alltför stort; kommer troligen avvisas av servern."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
 "Hämtningsområdets storlek är ok, kommer troligen accepteras av servern."
 
-#. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
-msgid "Null pointer exception, possibly some missing tags."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "Ange en söksträng"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Kan inte läsa sökresultat för plats från servern"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Flytta vald medlem/valda medlemmar uppåt"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Välj vilken rad du vill ändra."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
 msgid "Enter a place name to search for:"
 msgstr "Ange ett platsnamn att söka efter:"
 
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Platser"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "namn"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "typ"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "nära"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "zooma"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Glidande karta"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "zoomnivå"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x från"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "till"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y från"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Rutnummer"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Ange ett platsnamn att söka efter:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
+msgid "Null pointer exception, possibly some missing tags."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Sök..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Riktning att söka efter land i"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6519,4 +6481,6 @@
 #. 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" />
@@ -6897,6 +6861,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6962,11 +6927,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6976,6 +6941,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6985,79 +6950,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "Namn"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Typ"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "nära"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Glidande karta"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "zoomnivå"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x från"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "till"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y från"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Rutnummer"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Användare"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7138,4 +7370,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7427,9 +7660,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ändrade objekt:"
+msgstr[1] "Ändrade objekt:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7525,5 +7758,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7553,59 +7795,59 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "Bilder för {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "Läs in GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Tid saknas för punkt {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "Läser {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Inga bilder med läsbara tidsangivelser hittades."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "Läser {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Geotaggade bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS startpunkt: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS slutpunkt: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "nuvarande delta: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "tidsskillnad: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -7613,51 +7855,51 @@
 msgstr[1] "bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} inom spåret."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Synka klocka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG-bilder (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Datum i fil \"{0}\" kunde inte tolkas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Bild"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "Tidszon för GPS-enhet (skillnad mot foto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synkronisera Tid med GPS-enheten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Angiven tid kunde inte tolkas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7665,30 +7907,30 @@
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Anpassa linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Använd globala inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Rita linjer mellan punkter i detta lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Rita inte linjer mellan punkter i detta lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Välj alternativ för linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7696,5 +7938,5 @@
 msgstr "Anpassa färger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7703,5 +7945,5 @@
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7710,43 +7952,43 @@
 msgstr "Välj en färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "Markörer från namngivna punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Namngivna spårpunkter från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Importera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-ljudfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Ljudmarkörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Importera bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "Namn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Beskrivning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7756,28 +7998,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Längd: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7786,5 +8028,5 @@
 msgstr[1] "{0} rutter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7793,10 +8035,10 @@
 msgstr[1] "{0} sträckpunkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Omvandla till datalager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7806,11 +8048,11 @@
 "skicka in spår, se här:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7820,29 +8062,29 @@
 msgstr "Omvandlad från:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "Hämta från OSM längs med detta spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Hämta allting inom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Största tillåtna område per begäran:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7853,13 +8095,9 @@
 "Önskar du<br>fortsätta?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Det finns inte något GPX-spår i lagret att knyta ljudet till."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7869,5 +8107,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7877,23 +8115,23 @@
 "kunna uppskattas med någon rimlighet uteslöts."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datalager {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "utanför hämtat område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7902,39 +8140,55 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
 msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} raderad.)"
+msgstr[1] " ({0} raderad.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} raderad.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8102,6 +8356,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8116,6 +8368,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8298,5 +8548,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8635,20 +8885,19 @@
 msgstr "Språk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Aktivera inbyggda förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8663,6 +8912,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Uppdatera"
@@ -8815,68 +9063,102 @@
 msgstr "Kortkommando"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Välj vilken rad du vill kopiera."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
 msgstr "Ta bort vald källa från listan."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Redigera värdet av den valda nyckeln för alla objekt."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Lägg till ett nytt lager"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Uppdatera urvalslistan."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Redigera vald källa."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "Sortera snabbvalsmenyn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -9084,5 +9366,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "Mer information om denna funktion"
@@ -9147,16 +9429,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Snabbvalsgrupp ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Snabbvalsgrupp ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9164,5 +9446,5 @@
 msgstr "Ansluter till OSM-servern..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9273,5 +9555,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument"
@@ -9497,5 +9779,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9522,5 +9804,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9528,5 +9810,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9539,5 +9821,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9548,33 +9830,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Felaktigt lösenord eller användarnamn."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Varning: Lösenordet skickas okrypterat."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "Spara användare och lösenord (okrypterat)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "Logga in"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Bas-URL för OSM-servern (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9582,17 +9864,17 @@
 "Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Bas-URL för servern"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM-lösenord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9689,5 +9971,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9696,38 +9978,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9735,19 +10017,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ofullständig <roll>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Ogiltigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9756,7 +10038,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9766,25 +10052,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9792,5 +10078,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9799,5 +10085,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9805,5 +10091,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9812,13 +10098,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "Förbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9829,14 +10115,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "Hämta från OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9948,15 +10233,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Uppdatera insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "Hämta insticksprogram"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9970,29 +10255,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
+msgstr[0] "{0} Insticksmodulen har uppdaterats. Starta om JOSM."
+msgstr[1] "{0} Insticksmodulerna har uppdaterats. Starta om JOSM."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -10004,10 +10293,10 @@
 msgstr "Fel uppstod i insticksmodulen {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -10017,10 +10306,32 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Uppdatera insticksmoduler"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
@@ -10029,23 +10340,10 @@
 "inte hittas."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Insticksmodulen kunde ej hittas: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "Senaste uppdatering av insticksmoduler var för mer än {0} dagar sedan."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Du kan ändra det tidsintervall (i dagar) med vilket denna varning visas<br> "
-"med hjälp av inställningen 'pluginmanager.warntime'.)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
@@ -10054,16 +10352,16 @@
 "inställningarna?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Avaktivera insticksmodul"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "Behåll plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -10073,9 +10371,9 @@
 "JOSM har behörighet att skriva över de existerande."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -10084,10 +10382,10 @@
 "Ett oväntat undantag inträffade som kan ha kommit från plugin:en ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Enligt information inifrån insticksmodulen är dess upphovsman {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -10096,9 +10394,9 @@
 "innan du rapporterar en bugg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Skall insticksmodulen avaktiveras?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -10108,22 +10406,22 @@
 "frigöra insticksmodulen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "ingen beskrivning tillgänglig"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -10132,18 +10430,18 @@
 msgstr[1] "Hämtade information om insticksmoduler från {0} ställen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Kunde inte hitta någon information om insticksmoduler."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Alla installerade insticksmoduler är av senaste version."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10156,9 +10454,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Hämta saknade insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10173,9 +10471,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10197,19 +10495,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "okänd"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Insticksmodul som medföljer JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10275,5 +10573,5 @@
 msgstr "(Texten finns redan i urklipp.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10282,5 +10580,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10289,5 +10587,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10297,5 +10595,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10308,10 +10606,10 @@
 "är: <br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10320,5 +10618,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10327,16 +10625,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10346,5 +10644,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10353,5 +10651,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10360,5 +10658,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10367,10 +10665,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10379,10 +10677,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10393,5 +10691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10401,5 +10699,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10410,5 +10708,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10512,11 +10810,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10659,5 +10950,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -10673,10 +10965,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Udda"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10684,103 +10976,103 @@
 msgstr "Jämna"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10834,46 +11126,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extraherar GPS-plats från EXIF"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "Påbörjar foldergenomläsning"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "En av de valda filerna var null !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Läs in foton..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Läser igenom folder {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Fel vid läsning av filer från folder {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "Korrelerar med GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -11137,5 +11430,5 @@
 msgstr "Fel i fil {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11148,10 +11441,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11199,13 +11492,13 @@
 msgstr "Välj en av..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "Automatkälla"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11214,13 +11507,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11334,7 +11627,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "Visa koordinater som"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11352,5 +11644,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11391,13 +11683,13 @@
 msgstr "Skapa gräns"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11528,22 +11820,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "Byt plats"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "Ange en ny plats för nästa förfrågan"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "Lägg till ett nytt lager"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Plats"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11551,5 +11843,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "Lägg till ett nytt lager"
@@ -11563,9 +11855,9 @@
 msgstr "Hämta ny cookie (sessions-timeout)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11585,9 +11877,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "Justera WMS-lagrets position"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11609,5 +11900,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Tomt lager"
@@ -11636,5 +11927,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11645,18 +11936,18 @@
 "Skapa en ny."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "Cacheformatsfel"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11751,5 +12042,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Ingen data har lästs in."
@@ -12158,7 +12449,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "vatten"
@@ -12370,33 +12661,33 @@
 msgstr "LiveGPS-lager"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "Fånga GPS-spår"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "Anslut till en gpsd-server och visa nuvarande position i ett LiveGPS-lager."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Centrera en gång"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Centrera LiveGPS-lagret runt nuvarande position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Autocentrera"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Centrera kontinuerligt LiveGPS-lagret runt nuvarande position."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12485,24 +12776,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12653,4 +12944,9 @@
 msgstr "Firefox-applikationen"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Lager"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12699,30 +12995,30 @@
 msgstr "Tillåtna handlingar"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Fjärrstyrning har begärts för att hämta data från API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaljer om begäran: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Vill du tillåta detta?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "Bekräfta fjärrstyrd handling"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Fjärrstyrning har begärts för att importera data från följande URL:"
@@ -12741,7 +13037,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12750,4 +13044,5 @@
 #: ../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 ""
@@ -12769,25 +13064,25 @@
 msgstr "Öppna en lista över ruttnoder"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Criteria"
 msgstr "Kriterier"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
 msgid "Shortest"
 msgstr "Närmaste"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
 msgid "Fastest"
 msgstr "Snabbaste"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:139
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
 msgid "Reverse route"
 msgstr "Byt riktning på rutten"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "Rensa rutten"
@@ -12817,93 +13112,87 @@
 msgstr "Ange viktvärden"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Glidande karta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Automatisk zoomning: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Hämta ruta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
 msgstr "Visa status för ruta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Begär omrendering"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Hämta alla rutor"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "Öka zoomläge"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "Minska zoomläge"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "automatisk zoomning"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 msgid "autoload tiles"
 msgstr "automatisk hämtning av rutor"
 
 #. 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "GlidandeKarta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "Inställningar för insticksprogrammet GlidandeKarta"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Källor för rutor"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "Automatisk zoomning: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "Automatisk hämtning av rutor: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "Största tillåtna zoomläge: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "Största tillåtna zoomläge: "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "Tona bakgrund: "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "fel vid hämtning av metadata"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "begärd: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "fel vid begäran om uppdatering"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -12916,5 +13205,5 @@
 msgstr "Spara fångade data till en fil varje minut."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -13081,5 +13370,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Gatunamn"
@@ -13127,29 +13416,29 @@
 msgstr "Välj åtminstone en sluten väg som skall förenas."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "La till nod vid alla korsande sträckor"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Ta bort sträckor som inte är del av en inre multipolygon"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "Korrigera relationer"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "Slog ihop område som låg ovanpå sig själv"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "Slog ihop områden som låg ovanpå varandra"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -13159,33 +13448,33 @@
 "att det inte har uppstått några fel."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Ange värden för alla konflikter"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Jämka konflikter"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "Korrigera taggkonflikter"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "Tog bort element från relation"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "Slå ihop områden: Ta bort korta sträckor"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "Sluten sträcka"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "Ta bort taggar från inre sträckor"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13398,8 +13687,4 @@
 msgstr "Rätta till de valda felen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Ignorera"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13444,25 +13729,24 @@
 msgstr "Ersätt \"{0}\" med \"{1}\" för"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Kustlinjer."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Detta test kontrollerar om kustlinjerna är korrekta."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Oordnad kustlinje"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Oordnad kustlinje"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Oordnad kustlinje"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13484,19 +13768,19 @@
 msgstr "Korsande sträckor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Dubbletter av noder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr ""
 "Detta test kontrollerar att det inte finns några noder med precis samma läge."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13748,4 +14032,8 @@
 msgstr "Redigera vald källa."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Ta bort vald källa från listan."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13962,7 +14250,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "byggnad (building)"
@@ -13976,5 +14264,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "yta (area)"
@@ -13984,9 +14272,9 @@
 msgstr "Ej stängd sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Ej anslutna sträckor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
@@ -13994,17 +14282,17 @@
 "annan sträcka."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Slutnod nära annan väg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Slutnod nära annan sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Nod på sträcka nära annan sträcka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Slutnod på sträcka nära annan sträcka"
@@ -14102,21 +14390,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS-lager ({0}), hämtas i zoomläge {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14349,9 +14642,9 @@
 msgstr "Fel filformat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Öppna ett tomt WMS-lager för att läsa in data från en fil"
@@ -14802,6 +15095,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Referens"
@@ -15363,5 +15656,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15373,5 +15666,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "skog"
@@ -15659,7 +15952,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "ja"
@@ -15808,8 +16101,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "nej"
@@ -15936,31 +16229,4 @@
 msgstr "Redigera en korsning"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Typ"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -16081,5 +16347,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "bostadsgata"
@@ -16114,5 +16380,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "tillfartsväg"
@@ -16147,5 +16413,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "under byggnad"
@@ -16535,12 +16801,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operatör"
@@ -16753,6 +17019,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "Höjd"
@@ -17179,5 +17445,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "kärr"
@@ -17710,25 +17976,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Öppettider"
@@ -17794,24 +18060,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17824,24 +18090,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17854,24 +18120,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17904,6 +18170,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Referensnummer"
@@ -17919,5 +18185,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "underjordisk"
@@ -17931,5 +18197,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Avgift"
@@ -18165,5 +18431,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "VIndskydd"
@@ -18631,5 +18897,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cykling"
@@ -18644,5 +18910,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skidåkning"
@@ -18796,16 +19062,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Utgrävningsplats"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Redigera utgrävningsplats"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Redigera monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Minnesmärke"
@@ -18813,55 +19092,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Redigera minnesmärke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Redigera ett vägkors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Vägaltare"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Redigera ett vägaltare"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Nöje"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Badanläggning"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Redigera badanläggning"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Lekplats"
@@ -18869,35 +19148,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Redigera lekplats"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fiske"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Redigera fiske"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sportfaciliteteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Redigera stadion"
@@ -18911,6 +19190,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "välj sport:"
@@ -19302,30 +19581,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "sport"
@@ -19335,227 +19614,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "flera"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "bågskytte"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "friidrott"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australisk fotboll"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boule"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kanot"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "klättring"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "kricket_nät"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "hundracing"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "ridsport"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "amerikansk fotboll"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "hästkapplöpning"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "rackets"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "skytte"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skridskoåkning"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "skidåkning"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "fotboll"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "simning"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sporthall"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Redigera sporthall"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Plan"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Redigera plan"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Bana"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Redigera bana"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfbana"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Redigera golfbana"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Redigera minigolfbana"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Flera"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Redigera flersportsfacilitet"
+
+#. 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 "typ"
 
 #. item "Sport/Multi" combo "type"
@@ -19592,203 +19924,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "plan"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "sporthall"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadion"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Friidrott"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Redigera friidrott"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Bågskytte"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Redigera bågskytte"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klättring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Redigera klättring"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kanotpaddling"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Redigera kanotpaddling"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Redigera cykling"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Hundkapplöpning"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Redigera hundkapplöpning"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Ridsport"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Redigera ridsport"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Hästkapplöpning"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Redigera hästkapplöpning"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Redigera gymnastik"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Redigera motorsport"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skridskoåkning"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Redigera skridskoåkning"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Redigera skateboard"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Simning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Redigera simning"
@@ -19796,56 +20128,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Redigera skidåkning"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Skidspårstyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "utförsåkning"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "längdskidåkning"
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Svårighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "nybörjare"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "lätt"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "ospårat"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Skytte"
@@ -19853,182 +20185,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Redigera skytte"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Bollsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fotboll"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Redigera fotboll"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerikansk fotboll"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Redigera amerikansk fotboll"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australisk fotboll"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Redigera australisk fotboll"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Redigera baseball"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basket"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Redigera basket"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Redigera golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_bana"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Redigera boule"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Redigera cricket"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricketnät"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Redigera cricketnät"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Redigera krocket"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Redigera ishockey"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Redigera pelota"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Rackets"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Redigera rackets"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Redigera rugby"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Redigera bordtennis"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Redigera tennis"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Byggnader"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Byggnad"
@@ -20036,5 +20368,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Offentlig byggnad"
@@ -20042,10 +20374,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Redigera offentlig byggnad"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Stadshus"
@@ -20053,10 +20385,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Redigera stadshus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambassad"
@@ -20064,10 +20396,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Redigera ambassad"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Domstol"
@@ -20076,10 +20408,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Redigera domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Fängelse"
@@ -20088,10 +20420,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Redigera fängelse"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polisstation"
@@ -20101,10 +20433,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Redigera polisstation"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -20113,10 +20445,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Redigera brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postkontor"
@@ -20124,5 +20456,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Redigera postkontor"
@@ -20130,15 +20462,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Redigera barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Skola"
@@ -20146,10 +20478,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Redigera skola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Högskola/universitet"
@@ -20157,10 +20489,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Redigera högskola/universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Högskola"
@@ -20168,5 +20500,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Redigera högskola"
@@ -20174,5 +20506,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Biograf"
@@ -20181,10 +20513,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Redigera biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliotek"
@@ -20193,9 +20525,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Redigera bibliotek"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Konstcenter"
@@ -20203,10 +20535,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Redigera konstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teater"
@@ -20215,10 +20547,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Redigera teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Religiös helgedom"
@@ -20228,5 +20560,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Redigera religiös helgedom"
@@ -20235,6 +20567,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Religion"
@@ -20243,66 +20575,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "buddism"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "kristendom"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hinduism"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "judendom"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "daoism"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "zoroastrianism"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "Samfund"
@@ -20311,81 +20643,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglikaner"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptister"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "katoliker"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "evangelister"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "jehovas_vittnen"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "luteraner (inkl. Svenska kyrkan)"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "metodister"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pinstvänner"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbytarianer"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestanter"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "kväkare"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "shiamuslimer"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunnimuslimer"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresser"
@@ -20394,5 +20726,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Redigera adressinformation"
@@ -20400,5 +20732,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Husnummer"
@@ -20406,20 +20738,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Husnamn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Stadsnamn"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Landskod"
@@ -20428,5 +20760,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Redigera adressinterpolation"
@@ -20434,61 +20766,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Numreringsschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "udda"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "jämn"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Byggnadsverk"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Redigera fabriksbyggnad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Redigera torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20496,25 +20828,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vattentorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Redigera vattentorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasklocka"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Redigera gasklocka"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Fyrtorn"
@@ -20522,10 +20854,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Fyrtorn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Väderkvarn"
@@ -20533,10 +20865,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Redigera väderkvarn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Rörledning"
@@ -20545,37 +20877,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Redigera rörledning"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "naturgas"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Reningsverk"
@@ -20585,10 +20917,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Redigera reningsverk"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Kran"
@@ -20596,10 +20928,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Redigera kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Fyrbåk"
@@ -20607,10 +20939,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Redigera fyrbåk"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Mätpunkt"
@@ -20618,10 +20950,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Redigera mätpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Övervakning"
@@ -20629,5 +20961,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Redigera övervakningskamera"
@@ -20635,5 +20967,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -20643,35 +20975,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Redigera ett kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "vindkraft"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "vattenkraft"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fossila bränslen"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "kärnkraft"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "kolkraft"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "solkraft"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Kraftstation"
@@ -20680,10 +21012,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Redigera en kraftstation"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -20692,5 +21024,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Redigera en transformatorstation"
@@ -20698,10 +21030,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Kraftledningsmast"
@@ -20712,23 +21044,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "Redigera en kraftledningsmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Kraftledning"
@@ -20737,75 +21069,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Redigera en kraftledning"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Spänning"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "Inrättningar"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Toaletter"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Anteckning"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Brevlåda"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefon"
@@ -20814,5 +21146,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Redigera en telefon"
@@ -20820,5 +21152,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Mynt"
@@ -20826,5 +21158,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Anteckningar"
@@ -20832,5 +21164,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Betalkort"
@@ -20838,5 +21170,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "Kontokort"
@@ -20844,15 +21176,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Återvinning"
@@ -20861,5 +21193,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Redigera en återvinningsstation"
@@ -20867,35 +21199,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Burkar"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Kläder"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Papper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Metallskrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "Bänk"
@@ -20904,31 +21236,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20999,40 +21331,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "gräs"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Jakttorn"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
@@ -21041,30 +21372,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Dölj"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Fontän"
@@ -21073,10 +21404,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -21085,10 +21416,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -21096,33 +21427,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Stormarknad"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Redigera stormarknad"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Närköp"
@@ -21130,9 +21461,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Redigera närköp"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -21140,27 +21471,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Redigera kiosk"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Automat"
@@ -21168,5 +21499,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Redigera en automat"
@@ -21174,88 +21505,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "Slakteri"
@@ -21263,9 +21594,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "Redigera slakteri"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "Bageri"
@@ -21273,9 +21604,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "Redigera bageri"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "Florist"
@@ -21283,18 +21614,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "Redigera florist"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21302,54 +21633,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "Drycker"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "Dator"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "Redigera datoraffär"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "Electronik"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "Redigera elektronikaffär"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "Redigera hifi-affär"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "Möbler"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "Redigera möbelaffär"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "Trädgårdscenter"
@@ -21357,9 +21688,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "Redigera trädgårdscenter"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr "Järnvaror"
@@ -21367,9 +21698,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr "Redigera järnaffär"
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "Gör-det-själv-affär"
@@ -21377,54 +21708,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "Redigera gör-det-själv-affär"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "Kontorsmaterial"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "Redigera pappershandel"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "Hårfrisör"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "Redigera hårfrisör"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "Skor"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "Redigera skoaffär"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "Leksaker"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "Redigera leksaksaffär"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "Videobutik"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "Redigera videobutik"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Kemtvätt"
@@ -21432,9 +21763,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Redigera kemtvätt"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Tvätteri"
@@ -21442,9 +21773,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Redigera tvätteri"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Friluftsliv"
@@ -21452,28 +21783,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Redigera affär för friluftsliv"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "Redigera sportaffär"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "Redigera optiker"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Bank"
@@ -21481,14 +21812,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Redigera bank"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -21496,5 +21827,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Redigera växlingskontor"
@@ -21502,15 +21833,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Läkare"
@@ -21518,18 +21849,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Redigera läkare"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Redigera tandläkare"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -21537,5 +21868,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Redigera apotek"
@@ -21543,9 +21874,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Receptutlämnande"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -21553,10 +21884,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr ""
@@ -21565,5 +21896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -21572,20 +21903,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "Använd internationellt format, ex +12-345-67890"
@@ -21593,5 +21924,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -21600,59 +21931,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Redigera veterinär"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Platser"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Redigera en kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Redigera land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "Delstat"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "Redigera delstat"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Redigera region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "Län"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "Redigera län"
@@ -21660,15 +21996,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Redigera stad"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Småstad"
@@ -21676,10 +22012,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Redigera småstad"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Förort"
@@ -21687,25 +22023,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Redigera förort"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Mindre tätort"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Småort"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
@@ -21713,5 +22049,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Plats"
@@ -21719,10 +22055,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Redigera plats"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Ö"
@@ -21730,10 +22066,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Redigera ö"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21741,5 +22077,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21747,5 +22083,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Grottöppning"
@@ -21753,10 +22089,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Redigera en grottöppning"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Topp"
@@ -21764,10 +22100,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Redigera topp"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Glaciär"
@@ -21775,10 +22111,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Redigera en glaciär"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Vulkan"
@@ -21786,70 +22122,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Redigera en vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Gränser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Nationella"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Redigera nationsgränser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "Administrativ"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "Redigera administrativa gränser"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Civilrättslig"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Redigera en civilrättslig gräns"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Redigera politiska gränser"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Redigera gräns för nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Träd"
@@ -21858,15 +22194,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Redigera ett träd"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Botaniskt namn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Naturskog"
@@ -21875,5 +22211,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Redigera naturskog"
@@ -21881,17 +22217,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "barrskog"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "lövskog"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "blandskog"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "Kulturskog"
@@ -21900,14 +22236,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "Redigera användning av mark för skogsbruk"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "Redigera naturreservat"
@@ -21915,25 +22251,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Redigera bergssluttning (med lösa stenar)"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Buskage"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Redigera buskage"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Höglandshed"
@@ -21941,10 +22277,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Redigera en höglandshed"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Hed"
@@ -21952,5 +22288,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Redigera hed"
@@ -21958,5 +22294,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -21965,45 +22301,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr "Äng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
@@ -22011,25 +22347,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Gräs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Allmänning"
@@ -22037,10 +22373,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Redigera användning av mark för allmänning"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Allmänning"
@@ -22048,20 +22384,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Redigera allmänning"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -22069,5 +22405,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "Redigera användning av mark för fritidsområde"
@@ -22075,15 +22411,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Redigera användning av mark för bostadsområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -22091,9 +22427,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Redigera kyrkogård"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -22101,39 +22437,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Redigera användning av mark för affärsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -22141,15 +22477,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Redigera användning av mark för järnvägsmark"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Militärt område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Redigera användning av mark för militärt område"
@@ -22157,55 +22493,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Redigera användning av mark för deponi av avfall"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -22215,5 +22551,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr "Redigera en multipolygon"
@@ -22222,10 +22558,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr "yttre segement"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr "inre segment"
@@ -22233,5 +22569,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr ""
@@ -22240,5 +22576,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -22246,34 +22582,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -22282,15 +22618,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr "till sträcka"
@@ -22298,5 +22634,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22305,5 +22641,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22311,5 +22647,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22381,5 +22717,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22388,17 +22724,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22451,5 +22787,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22458,13 +22794,13 @@
 msgstr "fot"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr ""
@@ -22478,10 +22814,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr ""
@@ -22489,31 +22825,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr ""
@@ -22522,30 +22858,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22983,11 +23319,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "förlegad"
@@ -25011,5 +25347,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25681,4 +26017,12 @@
 #.
 #. <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"/>
@@ -25703,5 +26047,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "historisk"
@@ -25715,5 +26059,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "stenbrott"
@@ -25727,5 +26071,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr ""
@@ -25747,5 +26091,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "hamnbassäng"
@@ -25759,5 +26103,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "skog"
@@ -25771,5 +26115,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "gårdsplan"
@@ -25792,5 +26136,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "detaljhandel"
@@ -25804,5 +26148,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "industri"
@@ -25816,5 +26160,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25828,5 +26172,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25840,5 +26184,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25895,7 +26239,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "militär"
@@ -25909,5 +26253,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "begravningsplats"
@@ -25920,5 +26264,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "topp"
@@ -25933,5 +26277,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "glaciär"
@@ -25945,5 +26289,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "vulkan"
@@ -25998,8 +26342,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "naturfenomen"
@@ -26013,5 +26357,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "buskage"
@@ -26025,5 +26369,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "hed"
@@ -26037,8 +26381,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "yta (area)"
+msgstr ""
 
 #. color water
@@ -26050,5 +26393,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "lera"
@@ -26062,5 +26405,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "strand"
@@ -26138,8 +26481,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "rutt"
@@ -26187,7 +26530,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "gräns"
@@ -26337,11 +26680,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "plats"
@@ -26389,6 +26732,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "adress"
@@ -26696,61 +27039,97 @@
 msgstr ""
 
+#~ msgid "File could not be found."
+#~ msgstr "Filen kunde inte hittas."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Välj åtminstone en uppgift att hämta"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "Uppladningen till OSM API misslyckades"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Relationskonflikt"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Fel vid tolkning"
+
+#~ msgid "File not found"
+#~ msgstr "Filen hittades inte"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "Ange först önskade koordinater."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Välj ett bokmärke först."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Ange en söksträng"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Kan inte läsa sökresultat för plats från servern"
+
+#~ msgid "name"
+#~ msgstr "namn"
+
+#~ msgid "zoom"
+#~ msgstr "zooma"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Välj vilken rad du vill kopiera."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning "
+#~ "visas<br> med hjälp av inställningen 'pluginmanager.warntime'.)"
+
+#~ msgid "Request Update"
+#~ msgstr "Begär omrendering"
+
+#~ msgid "error loading metadata"
+#~ msgstr "fel vid hämtning av metadata"
+
+#~ msgid "requested: {0}"
+#~ msgstr "begärd: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "fel vid begäran om uppdatering"
+
+#~ msgid "Move"
+#~ msgstr "Flytta"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Osparade ändringar"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Unknown version"
+#~ msgstr "Okänd version"
+
+#~ msgid "unnamed"
+#~ msgstr "namnlös"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-användarnamn (email)"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Okänd filändelse."
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Alla sträckor var tomma"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "Onlinehjälp för JOSM"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
+
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Fel vid inläsning av sida{0}"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
-
-#~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
-#~ "\"{1}\">ditt språk</A>."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Använd snabbval ''{0}''"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "Öppna först ett lager (GPX, OSM, cache)"
-
-#~ msgid "Move"
-#~ msgstr "Flytta"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Osparade ändringar"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Unknown version"
-#~ msgstr "Okänd version"
-
-#~ msgid "unnamed"
-#~ msgstr "namnlös"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-användarnamn (email)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Avbryter..."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Okänd filändelse."
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Alla sträckor var tomma"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Onlinehjälp för JOSM"
 
 #~ msgid "Open in Browser"
@@ -26833,7 +27212,4 @@
 #~ msgstr "Konflikter upptäcktes under import."
 
-#~ msgid "Refresh the selection list."
-#~ msgstr "Uppdatera urvalslistan."
-
 #~ msgid "Contacting the OSM server..."
 #~ msgstr "Ansluter till OSM-servern"
@@ -26857,4 +27233,7 @@
 #~ "JOSM från."
 
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Använd snabbval ''{0}''"
+
 #~ msgid "Tagging preset sources"
 #~ msgstr "Källor för snabbval för taggning"
@@ -26973,4 +27352,7 @@
 #~ msgid "bicyclemap"
 #~ msgstr "cykelkarta"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
 
 #~ msgid "Found <member> element in non-relation."
@@ -27053,9 +27435,4 @@
 #~ msgstr "Fällgaller"
 
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Insticksmodulen har uppdaterats. Starta om JOSM."
-#~ msgstr[1] "{0} Insticksmodulerna har uppdaterats. Starta om JOSM."
-
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Lägg till antingen site-josm.xml eller wikisidor."
@@ -27161,4 +27538,7 @@
 #~ msgstr "Ta bort det valda"
 
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "Öppna först ett lager (GPX, OSM, cache)"
+
 #~ msgid "Selected makes your trace public in openstreetmap.org"
 #~ msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org"
@@ -27241,7 +27621,4 @@
 #~ "Ingen data som behövde uppdateras hittades. Har du redan öppnat eller "
 #~ "laddat ner ett datalager?"
-
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Följande fel uppstod vid massnedladdning:"
 
 #~ msgid ""
@@ -27276,7 +27653,4 @@
 #~ msgid "Undeleting relation..."
 #~ msgstr "Återskapar relation..."
-
-#~ msgid "Keep mine"
-#~ msgstr "Behåll mina"
 
 #~ msgid "Checking whether primitive {0} is gone ..."
@@ -27379,4 +27753,14 @@
 #~ msgstr "Laddar ner referenser..."
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A> eller <A HREF="
+#~ "\"{1}\">ditt språk</A>."
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Hjälpsida saknas. Skapa den på <A HREF=\"{0}\">engelska</A>."
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 18273)
+++ applications/editors/josm/i18n/po/tr.po	(revision 18508)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-17 15:08+0000\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-25 14:02+0000\n"
 "Last-Translator: katpatuka <email@katpatuka.org>\n"
 "Language-Team: Türkçe\n"
@@ -18,67 +18,67 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "Arayüz Oluşturuluyor."
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Yardım"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Yanlış linkler atlanıldı: URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -91,12 +91,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -106,27 +100,26 @@
 msgstr "Uyarı"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "hatalı dosya atlandı URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -134,23 +127,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -158,5 +152,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -165,21 +159,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -188,5 +183,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -199,17 +194,9 @@
 msgstr "Hata"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "BİLİNMEYEN"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "Hakkında"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "Hakkında penceresini göster."
@@ -217,37 +204,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap Editörü"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "Sürüm {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
 #, java-format
 msgid "Last change at {0}"
 msgstr "Son değişiklik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "Java Sürümü {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "Anasayfa"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "Hata raporları"
@@ -257,5 +244,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -263,33 +250,29 @@
 msgstr "Bilgi"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "Beni oku"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "Revizyon"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "Katkılar"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "Lisans"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "JOSM Hakkında..."
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "Dosya bulunamadı."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -320,42 +303,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -363,5 +345,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -374,19 +356,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -395,50 +377,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "Nokta Ekle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "Enlem ve Boylam girerek nokta ekle."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "Düzenle: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "Yeni nokta için koordinat giriniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "Ondalık derece kullan."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Negatif sayılar Batı/Güney yarımküreyi gösterir ."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -447,5 +429,5 @@
 msgstr "Enlem"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -454,27 +436,27 @@
 msgstr "Boylam"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
 msgid "Align Nodes in Circle"
 msgstr "Noktalar daire olarak hızala"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
 msgid "Move the selected nodes into a circle."
 msgstr "Seçili noktaları daire olarak yerleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -484,5 +466,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -498,30 +480,28 @@
 msgstr "Araç: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
 msgid "Please select at least four nodes."
 msgstr "En azından dört nokta seç."
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -531,84 +511,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
 msgid "Align Nodes in Line"
 msgstr "Noktalar düz çizgi olarak hızala"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Seçili noktalar düz çizgi olarak yerleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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 "En azından üç nokta seçmen lazım"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "veri"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "tabaka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "seleksiyon"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "çakışma"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "indir"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "{0} kadar yakınlaştır"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, 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:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "Görüntü: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "Yakınlaştıracak bir şey yok."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "Yakınlaştıracak bir çakışma yok."
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -616,37 +596,37 @@
 msgstr "Dosya: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
 msgid "Combine Way"
 msgstr "Yolları Birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "Çeşitli yolları birine birleştir."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "Yönü değiştirilsin mi?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "Yönü değiştirip birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -656,5 +636,5 @@
 "değiştirmek istermisiniz?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -662,41 +642,41 @@
 msgstr "Yollar birleştiriledi (Tek bir yoluna konulamadı)"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "{0} yol birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "Lütfen birleştirmek için en az iki yol seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "Kopyala"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "Seçili objeleri yapıştır alanına (buffer) kopyala."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 msgid "Please select something to copy."
 msgstr "Lütfen kopyalama için seçim yapınız"
 
-#: ../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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "Daire Oluştur"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "Seçili üç noktadan daire oluştur."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Bu noktalar daire şeklinde değiller. Vazgeçtik."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -706,16 +686,14 @@
 "yol seç"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -727,5 +705,5 @@
 msgstr "Sil"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "Seçili Objeleri Sil."
@@ -733,6 +711,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -746,73 +724,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
 msgid "Distribute Nodes"
 msgstr "Noktaları Dağıt"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Noktaları düz bir çüzgi olarak dağıt"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "OSM sitesinden indir..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "Harita verisi OSM sunucusundan indir."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "İndir"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "Lütfen en az bir indirme görevi seçiniz"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -821,39 +776,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "Dışalım işlemi esnasında {0} çakışma oldu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr "İndirirken çakışmalar oldu"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "Çift"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Kopyala ve Yapştır ile seçimi çiftle."
@@ -863,41 +818,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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 "Çıkış"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "Programı Kapat."
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "GPX olarak kaydet..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "Veri GPX dosyası olarak kaydet."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "Dışa vermek için bir şey yok. Önce veri al, salak!"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -936,6 +891,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -954,9 +909,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -976,5 +931,5 @@
 msgstr "parametre ''{0}'' zero (null) olamaz"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -982,36 +937,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr "GPX dosyası olarak kaydet..."
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
 msgstr "Eleman Bilgisi"
 
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 msgid "Join Node to Way"
 msgstr "Nokta ile yol birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
 msgid "Join a node into the nearest way segments"
 msgstr "Noktayı en yakın yol bölümüne birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "Nokta ile çizgi birleştir"
@@ -1021,169 +976,187 @@
 msgstr "Kısayol Yok"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr "Tabakalar birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge the current layer into another layer"
 msgstr "Varsayılan tabaka başka bir tabaka ile birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "Noktaları birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "Noktaları en eskisiyle birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "Birleştirmek için en azından iki nokta seçmen lazım."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "İptal Edildi..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
 "Noktalar birleştirilemiyor: Kullanılan bir yolun silinmesi gerekiyordu."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "{0} nokta birleştiriliyor"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
 msgid "Merge selection"
 msgstr "Seleksiyonu birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../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:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
 msgid "Please select at least one node or way."
 msgstr "En azından bir nokta veya bir yol seç"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "yukarı"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Objeleri taşı {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "aşağı"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "sol"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "sağ"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Taşı {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Objeleri taşı {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "Objeleri dünya dışına taşıyamazsın."
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "Yeni"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "Yeni harita oluştur."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "Aç..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "Dosya aç."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
 msgid "Open Location..."
 msgstr "Konum Aç..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "Bağlantı aç..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "farklı Tabaka"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "Lokasyonu indir"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "Bilgi İndiriliyor"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "Dikdörtgen olarak şekilendir"
@@ -1193,18 +1166,18 @@
 msgstr "Noktaları taşı, açılar 90 veya 270 derece olsun"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1213,9 +1186,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1224,37 +1197,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "Dikdörtgenleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "Yapıştır hafızasındaki bilgileri yapıştır."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 msgid "Paste Tags"
 msgstr "Etiketleri Yapıştır"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr ""
 "Yapıştırma hafızsında bulunan etiket içeriklerini seçili elemanlara ekle."
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1263,5 +1237,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1270,59 +1244,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "Tercihler..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "Genel ayarlar için tercihler sayfasını aç."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
 msgid "Redo"
 msgstr "Tekrar Yap"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "Son bitmemiş komutu tekrar yap."
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Takayı yeniden isimlerdir"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Dosyayıda yeniden isimlendir"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Yolları ters çevir"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "Seçili yollar için yönü ters çevir."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "Lütfen en az bir yol seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "Yolları ters çevir"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1330,10 +1304,10 @@
 msgstr "Kaydet"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "Şimdiki bilgiyi kaydet."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1382,21 +1356,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "Farklı Kaydet..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "Varolan bilgileri yeni bir dosyaya kaydet."
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Hepsini Seç"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1406,28 +1380,28 @@
 "eksik objeleride seçer"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
+msgid "Show Status Report"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
-msgid "Show Status Report"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1436,23 +1410,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Yolları Böl"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Seçili kavşakta yolu böl."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "Yapılan seçim bölme için kullanılamaz."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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] "Seçili kavşak herhangi bir yolun ortasında değil."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1464,19 +1438,19 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "seçili kavşaklar aynı yolu paylaşmıyorlar."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
 msgstr[0] "Seçili yol seçili kavşakları içermiyor."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Dairesel bir yolu bölmek için iki veya fazla kavşak seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1502,60 +1476,60 @@
 msgstr "{0} Yolu  {1} parçaya bölünecek"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
 msgid "Toggle GPX Lines"
 msgstr "GPX hatlarını sabitle"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 msgid "Draw lines between raw gps points."
 msgstr "GPS noktaları boyunca çiz."
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #, java-format
 msgid "Toggles the global setting ''{0}''."
 msgstr "Genel ayarları sabitle ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Yolları Çıkar"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Birçok yol tarafında kullanılan kavşakları çift yap."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "Bu kavşak başka bir nesneye yapışık değil."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "Kavşakların hiçbiri herhangi bir nesneye yapışık değil."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Yolların kavşakları herhangi nesneye yapışık değil."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "Seçim çıkartmak için kullanılamaz."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "Şunların Arasında Seçiniz:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* Birden fazla yol için kullanılan kavşak, veya"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr "* Birden fazla yol için veya şu yollardan biri için, veya"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1564,5 +1538,5 @@
 "kullanılabilir, veya"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1570,5 +1544,5 @@
 "* Yolun bir veya birkaç kavşağı, birden fazla yol tarafında kullanılabilir."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1581,9 +1555,9 @@
 "kopyalarını oluşturur ve bütün kavşaklar seçilir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1591,80 +1565,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr "{0} kavşalarını {1} kavşakları üzerine getir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
 msgid "Undo"
 msgstr "Geri AL(undo)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "Son komutu geri al."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "Seçimleri Kaldır"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "Objelerdeki seçimi kaldır."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "Seçimleri Kaldır (Odak)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "Seçimleri Kaldır (Kaçış)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Server'dan gelen bilginin sınırlarını çiz ."
 
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr ""
@@ -1676,8 +1651,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1686,5 +1661,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1692,29 +1667,29 @@
 msgstr "Yüklenilecek değişiklik yok."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "Yüklenilecek bişey yok. Lütfen ilk seçim yapınız."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1728,11 +1703,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1743,5 +1718,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1751,23 +1726,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "İlişkilerde Karışıklık"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1778,28 +1752,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1808,17 +1773,31 @@
 #. we tried to delete an already deleted primitive.
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
+#, fuzzy, java-format
+msgid "Uploading {0} objects ..."
+msgstr "{0} Objeyi Değiştir"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1837,11 +1816,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "İçeri Yakınlaştır"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "Zoom Out"
@@ -1921,21 +1900,17 @@
 msgstr "Yavaş İleri Götür"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "GPS verisi indiriliyor"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "Ham GPS verisi"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "Bilgi İndiriliyor"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1943,27 +1918,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap verisi"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "Kullanıcının Adı."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "Yoksay"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+msgid "Click to abort and to resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1975,7 +1961,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "İndirirken çakışmalar oldu"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1997,5 +1998,5 @@
 msgstr "Mode: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2025,38 +2026,38 @@
 msgstr "seçilmiş"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 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:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "Yola kavşak ekle ve birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2065,14 +2066,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr ""
@@ -2092,5 +2093,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız."
@@ -2102,5 +2103,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız."
@@ -2162,5 +2163,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2169,5 +2170,5 @@
 "yapıştır."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2177,4 +2178,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "Zoom"
@@ -2194,5 +2196,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Ara..."
@@ -2291,42 +2292,48 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2336,51 +2343,51 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "Arama"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "''{0}'' için herhangi karşılık bulunamadı"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "''{0}'' için yapılan aramada, herhangi birşey çıkartılmadı"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} Eşleşme bulundu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2411,26 +2418,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "or için eksik argüman."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "not için eksik argüman."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "Parantezlerin kapanması beklenir."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+msgid "Wrong number of parameters for tags operator."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2439,5 +2457,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2532,4 +2550,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2547,8 +2581,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "{0} Objeyi Değiştir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2628,5 +2662,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2662,4 +2696,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "parametre ''{0}'' zero (null) olamaz"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2690,29 +2735,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "İlişkilerde Karışıklık"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "Yol segmentini ayrıştır"
@@ -2720,6 +2742,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2730,5 +2752,5 @@
 "objeler onu kullanıyor olabilir. <br>Gerçekten silmek istiyormusunuz?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2914,15 +2936,30 @@
 msgstr "Otomatic etiket düzetmesi"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "Varsayılan değer ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2931,5 +2968,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2938,5 +2975,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2945,5 +2982,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2952,5 +2989,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2958,5 +2995,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2965,5 +3002,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2972,5 +3009,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2979,5 +3016,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2986,19 +3023,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Tercihler {0} üzerinde saklanıldı"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Could not upload preferences. Reason: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "Tercihler serverdan alınamadı."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -3007,5 +3067,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "BİLİNMEYEN"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3027,20 +3107,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "G"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "K"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "B"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "D"
@@ -3051,4 +3131,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3116,14 +3210,14 @@
 msgstr "Uyarı: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3131,5 +3225,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3156,6 +3250,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3215,113 +3309,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "Alan stili yol kapalı değil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "multipoligon yolu ''{0}'' kapalı değil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "''{0}'' üyesini ilişkiden sil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Yol ''{0}'' iki noktadan az içeriyor."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+msgid "More than one \"to\" way found."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+msgid "More than one \"via\" found."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-msgid "More than one \"to\" way found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
-msgid "More than one \"via\" found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "iç yol ''{0}'' dışarıda."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Kullanışlı rol yok ''{0}''  ''{1}'' yolu için."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Yol-Değil ''{0}'' multipolygon içinde."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipoligon için dış yol yok ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "iç yol ''{0}'' dışarıda."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "İç yol stili ''{0}'' multipolygon ."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3337,11 +3431,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "metin"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3357,5 +3450,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3365,5 +3457,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3390,5 +3481,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "arkaplan"
@@ -3417,12 +3508,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambert Zone (Fransa)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambert Zone (Fransa)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3458,10 +3547,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3490,5 +3579,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "demiryolu"
@@ -3505,4 +3594,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3516,33 +3607,33 @@
 msgstr[0] "{0} üye"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3550,16 +3641,16 @@
 msgstr "Çelişki"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr "Tanımsız host"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3571,4 +3662,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+msgid "Click to close the dialog"
 msgstr ""
 
@@ -3640,74 +3735,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "KullanıcıAdı"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "şifre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "kullanım"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "seçenekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "Bu Yardımı Göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "Standart unix geometry argümanı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "Kutu ile belirlenen sınırları indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Dosya Aç (ham gps, eğer .gpx ise)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 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:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "Yapılan aramaya göre seçim yap"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "Tercihleri varsayılan değerlere getir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "Dil seçimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3716,9 +3811,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "örnekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3728,25 +3823,25 @@
 "bir harita yükleyiniz --selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "--download=<bbox> indirmek yerine osm://<bbox> kullanabilirsin\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "Güncellenen eklentiler aktif olacak"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "Eski eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "Varsayılan ayarlar alınıyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "Eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3759,11 +3854,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3788,6 +3883,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3888,25 +3983,21 @@
 msgstr "(obje yok)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "tabaka listede yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "Ayrıştırma esnasında hata"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "Dosya bulunamadı"
+#: ../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
@@ -3927,5 +4018,5 @@
 msgstr "atanmamış: bu özelliği seçili objeye atamayın"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3954,23 +4045,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "{0} Objeyi Değiştir"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "Seçili Objeleri Sil."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "silindi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "İlişki"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -3982,5 +4071,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4029,5 +4118,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4044,5 +4133,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4242,8 +4331,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4550,6 +4639,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4563,6 +4652,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4620,36 +4709,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4661,5 +4750,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "hepsi"
@@ -4749,4 +4838,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4756,4 +4847,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4766,49 +4858,82 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+msgid "Enter a role for all relation memberships"
+msgstr "Bütün çakışmaları için yeni değerler gir."
+
+#: ../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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4845,6 +4970,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4931,10 +5056,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -5001,5 +5123,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5044,4 +5167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5067,6 +5191,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5074,22 +5198,22 @@
 msgstr[0] "İşlem {0} objeyi değiştirecek."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "Boş değer anahtarı sildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<farklı>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Değerleri Değiştir?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5097,69 +5221,73 @@
 msgstr[0] "Değerleri {0} obje için değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "Lütfen bir anahtar seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Lütfen bir değer seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "Özelliklerini değiştirmek istediğiniz objeleri seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "Özellikler/Üyelikler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "Seçili objenin özellikleri"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "Üyesi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "Özellik Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 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/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "Özellikleri Değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 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/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Özellik: {0} / Üyelik: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "Özellik / Üyelik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "İlişkiyi değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, 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/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "Seçili anahtarı her objeden sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "Özelliği Sil"
@@ -5167,40 +5295,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "İlişkiler"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "İlişkilerin listesini göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "İlişkiler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "Seçili ilişki için bir editör aç."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "Seçili ilişkiyi sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "Yeni ilişki oluştur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "Seçili ilişkiyi sil"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "Şunların Arasında Seçiniz:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "Seçili ilişkiyi sil"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "Üyeleri İndir"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5227,5 +5375,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5237,14 +5385,14 @@
 msgstr "Seçim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "Panelin kilidini Kaldır"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "paneli büyütüp/küçültmek için tıklayınız"
@@ -5326,5 +5474,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5354,23 +5503,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5379,14 +5528,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5396,9 +5545,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5408,15 +5557,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5424,5 +5573,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5430,20 +5579,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5452,66 +5601,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "Seçili üyeyi yukarı taşı"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "Seçili üyeyi aşağı taşı"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5520,9 +5669,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5531,41 +5680,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "Üyeleri İndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5575,17 +5724,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5596,13 +5745,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5616,14 +5765,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5673,58 +5822,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "Bağlı Değil"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "Sık Kullanılanlar"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "lütfen ilk olarak istenilen koordinatı giriniz."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "Alanları Oluştur"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Seçili üyeyi aşağı taşı"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "Lütfen bu yer için bir isim giriniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "İlk olarak sık kullanılanlardan bir yer seçiniz."
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "Seçili üyeyi yukarı taşı"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "Seçili üyeyi yukarı taşı"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5732,356 +5911,136 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "Sınır Çerçevesi"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "Bilgi Kaynağı ve Tipi"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap verisi"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "Seçili kavşakta yolu böl."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "Ham GPS verisi"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Seçili yol seçili kavşakları içermiyor."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "Yeni tabaka olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "Alanı indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "İndir"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "seçili GPX izi yok"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Seçilen alan çok büyük; server iptal edecektir"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Seçilen alan uygun, server kabul edecektir"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "Seçili üyeyi yukarı taşı"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "Editlemek için bir satır seçiniz."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "Aranacak yerin adını giriniz:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "Aranacak yerin adını giriniz:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 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:168
-msgid "Please enter a search string"
-msgstr "Lütfen aranacak bir metin giriniz"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "Arama sonucu server dan alınamadı"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "Aranacak yerin adını giriniz:"
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "Yerler"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-msgstr "sism"
-
-#. 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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "tip"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "yakın"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "yaklaş"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "Hareketli Harita"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "zoom seviyesi"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x burdan"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "buraya"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y burdan"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "Pafta Numarası"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "Ara..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "Karaya doğru yön araması"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6439,4 +6398,6 @@
 #. 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" />
@@ -6817,6 +6778,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6882,11 +6844,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6896,6 +6858,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6905,79 +6867,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "İsim"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "Tip"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "yakın"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "Hareketli Harita"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "zoom seviyesi"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x burdan"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "buraya"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y burdan"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "Pafta Numarası"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "Kullanıcı"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7058,4 +7287,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7347,9 +7577,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Düzenlenecek objeler:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7445,5 +7674,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7473,110 +7711,110 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "{0} için görüntüler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "GPX Oku..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Noktalrı için {0} x {1} zaman yok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Zaman şu noktalar  \"{0}\" {1} x {2} için okunamadı"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "{0} Okunuyor..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "Zaman damgası okunabilen bir görüntü bulunamadı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "{0} Okunuyor..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "Geotagged Görüntüler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS başlangıç: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS bitiş: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "şu anki delta: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "zaman dilimi farkı: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
 msgstr[0] "görüntü"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} izde var."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "Saati eşle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG görüntüsü (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "\"{0}\" dosyasındaki zaman ayrıştırılamadı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "EXIF zamanı \"{0}\" dosyasında yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "Görüntü"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Gösterilecek tarihi giriniz (ay/gün/yıl saat:dakika:saniye)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "GPS ünitesi zamandilimi (resim farkı)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "Girilen zaman ayrıştırılamadı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7584,30 +7822,30 @@
 msgstr "gps noktası"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "Çizimi özelleştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "Genel ayarları kullan."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "Bu tabaka için çizgiler arasını birleştir."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "Bu tabaka için çizgileri birleştirme."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "Çizim seçeneklerini seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7615,5 +7853,5 @@
 msgstr "Renkleri Ayarla"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7622,5 +7860,5 @@
 msgstr "Varsayılan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7629,43 +7867,43 @@
 msgstr "Renk seç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "işaretli noktalardan imleçler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} isim verilen izler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "Sesi içeri al"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} daki ses imleçleri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "Görüntüleri içeri al"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "İsim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "Tanım: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7675,28 +7913,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "Uzunluk: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7704,5 +7942,5 @@
 msgstr[0] "{0} rut, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7710,10 +7948,10 @@
 msgstr[0] "{0} yol noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "Bilgi tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7723,11 +7961,11 @@
 "yüklemek isterseniz buraya bakınız:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7737,29 +7975,29 @@
 msgstr "Çevrildiği yer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "OSM den bu izi indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "Bunun içindeki herşeyi indir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metre"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "Her istek için max. alan:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7770,13 +8008,9 @@
 "istiyor musunuz?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Tabakada ses ile ilişkilendirilecek GPX izi yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7784,5 +8018,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7791,23 +8025,23 @@
 "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "indirilen alanın dışında"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7816,39 +8050,52 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} silindi.)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} şunları içerir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} silindi.)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -8007,6 +8254,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8021,6 +8266,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8195,5 +8438,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8521,20 +8764,19 @@
 msgstr "Dil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "Önceden tanımlanmış ayarları etkinleştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8549,6 +8791,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "Güncelle"
@@ -8699,68 +8940,102 @@
 msgstr "Kısayol"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "Kopyalamak için bir satır seçiniz."
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
 msgstr "Seçili kaynağı listeden sil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Seçili anahtarın değerini her obje için düzenle"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+msgid "Add the selected available styles to the list of active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "Yorum Ekle"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "Seçim listesini yenile."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "Seçili kaynağı kontrol et."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8955,5 +9230,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr ""
@@ -9017,16 +9292,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "Varolan Grup ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "Varolan Grup ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9034,5 +9309,5 @@
 msgstr "OSM Server'ına Bağlanıyor..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9143,5 +9418,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı."
@@ -9367,5 +9642,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9392,5 +9667,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9398,5 +9673,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9409,5 +9684,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9418,50 +9693,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "Hatalı kullanıcı adı veya şifre."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Uyarı: Şifre düz metin olarak ileticektir."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "KullanıcıAdı ve şifreyi Sakla (Düz Metin Olarak)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSM için asıl link"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "Asıl Link"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM şifresi"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9558,5 +9833,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9565,38 +9840,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9604,19 +9879,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ref=0, eksik <member> tanımı."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "Geçersiz obje bulundu id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9625,7 +9900,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9635,25 +9914,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9661,5 +9940,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9668,5 +9947,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9674,5 +9953,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9681,13 +9960,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9698,14 +9977,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "OSM sitesinden indir..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9818,15 +10096,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "Eklentileri Güncelle"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9839,29 +10117,32 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
+msgstr[0] "{0} Eklenti güncelledi. Programı yeniden açınız."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9873,10 +10154,10 @@
 msgstr "Eklentide hata oluştu {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9886,49 +10167,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "En son eklenti güncellemesi {0} gün önce yapıldı."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "Eklentileri Güncelle"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Eklenti Bulunamadı: {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "En son eklenti güncellemesi {0} gün önce yapıldı."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(Bu uyarı yapıldıktan sonraki gün sayısını 'pluginmanager.warntime' dan "
-"değiştirebilirsin.<br>"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Eklenti yüklenemedi {0}. Tercihlerden silinsin mi?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "Eklentiyi Pasif Yap"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9938,9 +10228,9 @@
 "üzerine yazma yetkisi varmıdır kontrol ediniz."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9948,10 +10238,10 @@
 msgstr "''{0}'' Eklentisinden beklenmeyen bir durum oluştu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Eklenti Yazarın {0} Olduğunu Belirtiyor."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -9959,9 +10249,9 @@
 "Hata bildirmeden önce eklentinin yeni versiyonu ile güncellemeyi deneyin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "Eklentiyi Pasif Hale Getireyim mi?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9971,22 +10261,22 @@
 "çalıştırın."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "Açıklama mevcut değil"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9994,18 +10284,18 @@
 msgstr[0] "{0} sitesinden indirilen eklenti"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "Eklenti bilgisi bulunamadı."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "Bütün eklentiler güncel."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -10018,9 +10308,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "Eksik eklentileri yükle"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10035,9 +10325,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10059,19 +10349,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versiyon {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "Eklenti JOSM ile beraber geliyor."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10135,5 +10425,5 @@
 msgstr "(Metin zaten panoda mevcut.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10142,5 +10432,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10149,5 +10439,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10157,5 +10447,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10165,10 +10455,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10177,5 +10467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10184,16 +10474,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10203,5 +10493,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10210,5 +10500,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10217,5 +10507,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10224,10 +10514,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10236,10 +10526,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10250,5 +10540,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10258,5 +10548,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10267,5 +10557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10367,11 +10657,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10514,5 +10797,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Adres İnterpolasyon"
@@ -10528,10 +10812,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10539,103 +10823,103 @@
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10689,46 +10973,47 @@
 "{0} km/h"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIF den GPS verisi çıkartılıyor"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "klasör arama başladı"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "Seçilen yollardan birisi null !!!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "Fotoğraflar okunuyor..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Kananoik yol klasör için bulunamadı {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Klasör aranıyor {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Klasörde null dosya bulundu {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Klasörden dosya alınmasında hata oluştu {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "GPX e göre ilişkilendir"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -10989,5 +11274,5 @@
 msgstr "Dosyada Hata {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -11000,10 +11285,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11051,13 +11336,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11066,13 +11351,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11180,7 +11465,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "koordinatları şu şekilde göster"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11198,5 +11482,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11237,13 +11521,13 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11374,22 +11658,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11397,5 +11681,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr ""
@@ -11409,9 +11693,9 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11430,9 +11714,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "WMS tabakasının pozisyonunu ayarla"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11454,5 +11737,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "Boş Tabaka"
@@ -11481,5 +11764,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11488,18 +11771,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11594,5 +11877,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "Bilgi yüklenemedi."
@@ -12000,7 +12283,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "su"
@@ -12209,33 +12492,33 @@
 msgstr "Canlı GPS tabakası"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "GPS izini takip et"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr ""
 "gpsd server ına bağlan ve şu anki pozsiyonu CanlıGPS tabakasında göster"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "Merkeze koy"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "Canlı GPS verilerini tabakadfa merkeze koy."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "Otomatik-Merkezleme"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Devamlı olarak canlı GPS tabakasını görüntünün ortasına getir"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "Canlı GPS"
@@ -12324,24 +12607,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12489,4 +12772,9 @@
 msgstr "Firefox exe"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "Tabaka"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12534,30 +12822,30 @@
 msgstr "Onaylanan Hareket"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../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 tarafından uzaktan kontrol veri yüklemesi soruldu."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
 #, java-format
 msgid "Request details: {0}"
 msgstr "İstek Detayı: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "Buna izin veriyormusunuz?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "uzak kontrol haereketini onayla"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Şu linkten uzak kontrolle veri alınmak istenildi.Link:"
@@ -12576,7 +12864,5 @@
 msgstr ""
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12585,4 +12871,5 @@
 #: ../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 ""
@@ -12604,25 +12891,25 @@
 msgstr ""
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr ""
@@ -12652,93 +12939,87 @@
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "Hareketli Harita"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "Zoom"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "Mozaik Yükle"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
 msgstr "Mozaik Durumunu Göster"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "Güncelleme İste"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "Bütün Mozaikleri Yükle"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "Mozaik Kaynakları"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "zoom seviyesi"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr ""
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "meta veri yüklemesinde hata"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr ""
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "istendi: {0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "güncelleme isteğinde hata"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -12751,5 +13032,5 @@
 msgstr "Yakalanan veriyi her dakika otomatik sakla."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12911,5 +13192,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Sokak Adı"
@@ -12956,29 +13237,29 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -12986,33 +13267,33 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "Bütün çakışmaları için yeni değerler gir."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "Çakışmaları Çöz"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr ""
@@ -13219,8 +13500,4 @@
 msgstr "Seçili hataları onar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "Yoksay"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13265,25 +13542,24 @@
 msgstr "\"{0}\" u, \"{1}\" bununla değiştir"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "Sahip çizgisi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "Bu test sahil çizgisi doğrumu diye kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "Sırasız sahil çizgisi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "Sırasız sahil çizgisi"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "Sırasız sahil çizgisi"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13305,18 +13581,18 @@
 msgstr "kesişine yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "Çift Noktalar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13565,4 +13841,8 @@
 msgstr "Seçili kaynağı kontrol et."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "Seçili kaynağı listeden sil."
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13777,7 +14057,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "yapılar"
@@ -13791,5 +14071,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "alan"
@@ -13799,26 +14079,26 @@
 msgstr "Kapanmamış yollar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "Bağlantısız yollar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
 "Bu test bir yolun son noktasının yakınında başka yol varmı kontrolunu yapar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "Yolun sonunda başka karayolu var"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "Yolun sonunda başka yol var"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "Yolun sonunda başka yol var"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "Bağlı yolun sonuda başka yol var"
@@ -13911,21 +14191,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS tabakası ({0}), görüntü seviyesi {1}"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr ""
@@ -14160,9 +14445,9 @@
 msgstr "Dosya Format Hatası"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "Veri yüklemek için boş bir WMS tabakası aç"
@@ -14612,6 +14897,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "Referans"
@@ -15173,5 +15458,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15183,5 +15468,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr "orman"
@@ -15469,7 +15754,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "Evet"
@@ -15618,8 +15903,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "hayır"
@@ -15746,31 +16031,4 @@
 msgstr "Kavşak Düzenle"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "Tip"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15891,5 +16149,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "yerleşim_alanı"
@@ -15924,5 +16182,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "servis"
@@ -15957,5 +16215,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "inşaat"
@@ -16345,12 +16603,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "Operator"
@@ -16563,6 +16821,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "yükseklik"
@@ -16989,5 +17247,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr "batak"
@@ -17520,25 +17778,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr "Açılış saati"
@@ -17604,24 +17862,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17634,24 +17892,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17664,24 +17922,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17714,6 +17972,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr "Referans Numarası"
@@ -17729,5 +17987,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "yer altı"
@@ -17741,5 +17999,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "Ücret"
@@ -17975,5 +18233,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr "Sığınak"
@@ -18441,5 +18699,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Bisiklet"
@@ -18454,5 +18712,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Kayak"
@@ -18606,16 +18864,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "Arkeolojik Site"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "Arkeolojik Site Düzenle"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Anıt"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Anıt Düzenle"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Abide"
@@ -18623,55 +18894,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Abide Düzenle"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Yol Kenar Geçişi Düzenle"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri Düzenle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Dinlenme Alanı"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Su Parkı"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Su Parkı Düzenle"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Oyun Sahası"
@@ -18679,35 +18950,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Oyun Sahası Düzenle"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Balıkçılık"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Balıkçılık Düzenle"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Spor Aktivite"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadyum"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Stadyum Düzenle"
@@ -18721,6 +18992,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "Spor Seç"
@@ -19112,30 +19383,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "spor"
@@ -19145,227 +19416,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "çoğul"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "okçuluk"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "avustralya_footbol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "basebol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketbol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "bowling"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "çimen bowling"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "tırmanma"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "köpek yarışı"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "at binicilik"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "futbol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "jimnastik"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokey"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "at_yarışı"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "raket"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "kaykay"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "paten"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "kaymak"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "futbol"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "yüzmek"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "masa_tenisi"
 
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "spor merkezi"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "spor merkezi düzenle"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "atıcılık"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "atıcılık düzenle"
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "yarış pisti"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "yarış pisti düzenle"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golf Alanı"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Golf Alanı Düzenle"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minyatür Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Minyatür Golf Düzenle"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Spor"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Çoğul"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Çoğul Düzenle"
+
+#. 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 "tip"
 
 #. item "Sport/Multi" combo "type"
@@ -19402,203 +19726,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "atıcılık"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "spor_merkezi"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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 "stadyum"
 
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "10pin Düzenle"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Atletik Düzenle"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "okçuluk"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "okçuluk düzenle"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "tırmanma"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "tırmanma düzenle"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Kano Düzenle"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Bisiklet Düzenle"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Köpek Yarışı"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Köpek Yarışı Düzenle"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "binicilik"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "binicilik düzenle"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "At Yarışı"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "At Yarışı Düzenle"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "jimnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "jimnastik düzenle"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motor Sporlar"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Motor Sporları Düzenle"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "patinaj"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "patinaj düzenle"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "kaykay"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "kaykay düzenle"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "yüzme"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "yüzme düzenle"
@@ -19606,56 +19930,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Kayak Düzenle"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Atıcılık"
@@ -19663,182 +19987,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Atıcılık Düzenle"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Spor (Topla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Futbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Futbol Düzenle"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerikan Futbolu"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Amerikan Futbolu Düzenle"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Avustralyan Futbol"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Avustralyan Futbol Düzenle"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Baseball Düzenle"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketbol"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Basketbol Düzenle"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Golf Düzenle"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_alanı"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Boule Düzenle"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Bowling Düzenle"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Kricket Düzenle"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Cricket Nets Düzenle"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Kroke"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "kroke Düzelt"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Hockey Düzenle"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Pelota Düzenle"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Raket"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Raket Düzenle"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Rugby Düzenle"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Masa Tenisi"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Masa Tenisi Düzenle"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Tennis Düzenle"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Binalar"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Bina"
@@ -19846,5 +20170,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Kamu Binası"
@@ -19852,10 +20176,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Kamu Binası Düzenle"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "belediye binası"
@@ -19863,10 +20187,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "belediye binası düzenle"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Büyükelçilik"
@@ -19874,10 +20198,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Büyükelçilik Düzenle"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "adliye sarayı"
@@ -19886,10 +20210,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "adliye sarayı düzenle"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Hapishane"
@@ -19898,10 +20222,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Hapishane Düzenle"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polis"
@@ -19911,10 +20235,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Polis Düzenle"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "İtfaye İstasyonu"
@@ -19923,10 +20247,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "İtfaye İstasyonu Düzenle"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postane"
@@ -19934,5 +20258,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Postane Düzenle"
@@ -19940,15 +20264,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Anaokul"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Anaokul Düzenle"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Okul"
@@ -19956,10 +20280,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "okul düzenle"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universite"
@@ -19967,10 +20291,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Universite Düzenle"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "kolej"
@@ -19978,5 +20302,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "kolej düzenle"
@@ -19984,5 +20308,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Sinema"
@@ -19991,10 +20315,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Sinema Düzenle"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "kütüphane"
@@ -20003,9 +20327,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "kütüphane düzenle"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "sanat merkezi"
@@ -20013,10 +20337,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "sanat merkezi düzenle"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Tiyatro"
@@ -20025,10 +20349,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Tiyatro Düzenle"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Tapınak"
@@ -20038,5 +20362,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Tapınak Düzenle"
@@ -20045,6 +20369,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "Din"
@@ -20053,66 +20377,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "hristiyan"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "yahudi"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "müslüman"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "Zerdüştlük"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "mezhep"
@@ -20121,81 +20445,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "anglikan"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "katholik"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "protestan"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr "yahova_şahitleri"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adres"
@@ -20204,5 +20528,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Adres Bilgileri Düzenle"
@@ -20210,5 +20534,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Ev no:"
@@ -20216,20 +20540,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Ev İsmi"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Şehir Adı"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Posta Kodu"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Ülke Kodu"
@@ -20238,5 +20562,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Adres İnterpolasyon Düzenle"
@@ -20244,61 +20568,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Numara şeması"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "tek"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "çift"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "İnsan Yapımı"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Tesis"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Tesis Düzenle"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Kule"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Kule Düzenle"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20306,25 +20630,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Su Kulesi"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Su Kulesi Düzenle"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Gazdeposu Düzenle"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "DenizFeneri"
@@ -20332,10 +20656,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "DenizFeneri Düzenle"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Yeldeğerimeni"
@@ -20343,10 +20667,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Yeldeğerimeni Düzenle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Suboru Hattı"
@@ -20355,37 +20679,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Suboru hattı Düzenle"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "benzin"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Kanalizasyon Plant"
@@ -20395,10 +20719,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Kanalizasyon Plant Düzenle"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Vinç"
@@ -20406,10 +20730,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Vinç Düzenle"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Fener"
@@ -20417,10 +20741,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Fener Düzenle"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Poligon Noktası"
@@ -20428,10 +20752,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Poligon Noktası Düzenle"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Gözetim"
@@ -20439,5 +20763,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Gözetim Kamera Düzenle"
@@ -20445,5 +20769,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "Güç Jeneratorü"
@@ -20453,35 +20777,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "Güç Jeneratorü Düzenle"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "rüzgar"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "hidro"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "nükleer"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "kömür"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "güneş enerjisi"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr "Güç İstasyonu"
@@ -20490,10 +20814,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr "Güç İstasyonu Düzenle"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr "Alt Güç İstasyonu"
@@ -20502,5 +20826,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr "Alt Güç İstasyonu Düzenle"
@@ -20508,10 +20832,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr "çizgi referansı"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "Güç Kulesi"
@@ -20522,23 +20846,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "güç Kulesi Düzenle"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "Güç Hattı"
@@ -20547,75 +20871,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "Güç Hattı Düzenle"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "Voltaj"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "hoş mekan"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "Tuvalet"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr "Not"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "Posta Kutusu"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "Telefon"
@@ -20624,5 +20948,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "Telefon Düzenle"
@@ -20630,5 +20954,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "Madeni Para"
@@ -20636,5 +20960,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr "Notlar"
@@ -20642,5 +20966,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronik cüzdan ve Para Değişim Kartları"
@@ -20648,5 +20972,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr "ATM kartı"
@@ -20654,15 +20978,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "Kredi Kartı"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "Telefon kart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "Geri Dönüşüm"
@@ -20671,5 +20995,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "Geri Dönüşüm İstasyonu"
@@ -20677,35 +21001,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "Piller"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "Çöp Tenekesi"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "Kıyafet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "Cam"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "Kağıt"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "Hurda Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "banket"
@@ -20714,31 +21038,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20809,40 +21133,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr "yeşil"
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "ot"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr "Av Standı"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr "Av Standı Düzenle"
@@ -20851,30 +21174,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr "Yükseklik"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr "alçak"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr "yarım"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr "tam"
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr "Sakla"
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr "Kilitle"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "Kaynak"
@@ -20883,10 +21206,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "Kaynak Düzenle"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "İçme Suyu"
@@ -20895,10 +21218,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "İçme Suyu Düzenle"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr "Bebek Yuvası"
@@ -20906,33 +21229,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr "Bebek Yuvası Düzenle"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "Dükkanlar"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "Supermarket Düzenle"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "Bakkal"
@@ -20940,9 +21263,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "Bakkal Düzenle"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -20950,27 +21273,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr "Kiosk Düzenle"
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "Kahve Makinası"
@@ -20978,5 +21301,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "Kahve Makinası Düzenle"
@@ -20984,88 +21307,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "Ücretli Ürünler"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr "toplu_taşıma_bileti"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr "toplu_taşıma_hatları"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr "Park_bileti"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "yiyecek"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "içecek"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "tatlı"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "sigara"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "fotoğraf"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "hayvan_besini"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "gazeteler"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "oyuncuklar"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "pullar"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-kart"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr "telefon_kartı"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr "bilet"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "kondom"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr "tampon"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr "dışkı_poşeti"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr "hesap veya üyelik kartı"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "kasap"
@@ -21073,9 +21396,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "kasap düzenle"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "fırın"
@@ -21083,9 +21406,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "fırın düzenle"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr ""
@@ -21093,18 +21416,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr ""
@@ -21112,54 +21435,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr ""
@@ -21167,9 +21490,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21177,9 +21500,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "kendin-al-market"
@@ -21187,54 +21510,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "kendin-al-market düzenle"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "berber"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "berber düzenle"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "Kuru Temizleme"
@@ -21242,9 +21565,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "Kuru Temizleme Düzenle"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "Çamaşırhane"
@@ -21252,9 +21575,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "Çamaşırhane Düzenle"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "Dışortam"
@@ -21262,28 +21585,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "Dış ortam dükkanları düzenle"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "Kasa"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "Banka"
@@ -21291,14 +21614,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "Banka düzenle"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr "Döviz Bürosu"
@@ -21306,5 +21629,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr "Döviz Bürosu Düzenle"
@@ -21312,15 +21635,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "ATM Düzenle"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "Sağlık"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "Doktor"
@@ -21328,18 +21651,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "Doktor Düzenle"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "Dişçi"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "Dişçi Düzenle"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "Eczane"
@@ -21347,5 +21670,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "Eczane Düzenle"
@@ -21353,9 +21676,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "Dispenser"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "Hastane"
@@ -21363,10 +21686,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "Hastane Düzenle"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr "Acil Durum Noktası"
@@ -21375,5 +21698,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr "Acil Durum Noktası Düzenle"
@@ -21382,20 +21705,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr "Nokta Numarası"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Uluslararası kod kullanın, ör +90-212-67890)"
@@ -21403,5 +21726,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "Veteriner"
@@ -21410,59 +21733,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "Veteriner Düzenle"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "Yerler"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr "Kıta"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr "Kıta Düzenle"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr "Ülke"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr "Ülke Düzenle"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr "İl"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr "İl Düzenle"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr "Bölge"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr "Bölge Düzenle"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "vilayet"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "vilayet Düzenle"
@@ -21470,15 +21798,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "Şehir"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "Şehir Düzenle"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "Mahalle"
@@ -21486,10 +21814,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "Mahalle Düzenle"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "Banliyo"
@@ -21497,25 +21825,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "Banliyo Düzenle"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "Köy"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "Köy Düzenle"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr "Mezra"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr "Mezra Düzenle"
@@ -21523,5 +21851,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr "Semt"
@@ -21529,10 +21857,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr "Semt Düzenle"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "Ada"
@@ -21540,10 +21868,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "Ada Düzenle"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21551,5 +21879,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21557,5 +21885,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "Mağara Girişi"
@@ -21563,10 +21891,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "Mağara Girişi Düzenle"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "Zirve"
@@ -21574,10 +21902,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "Zirve Düzenle"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "Buzul"
@@ -21585,10 +21913,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "Buzul Düzenle"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "Volkan"
@@ -21596,70 +21924,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "Volkan Düzenle"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "Belediye Sınırı"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "Milli"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "Ülke Sınırı Düzenle"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "İdari"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "İdari Sınırları Düzenle"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "Sivil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "Sivil Sınırları Düzenle"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "Politik Sınır Düzenle"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "Milli Park Sınırı Düzenle"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "Arazi Kullanımı"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "Ağaç"
@@ -21668,15 +21996,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "Ağaç Düzenle"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "Botannik İsim"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr "Orman"
@@ -21685,5 +22013,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr "Orman Düzenle"
@@ -21691,17 +22019,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "Kozalaklı Orman"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "yaprak düken orman"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "karışık"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "orman"
@@ -21710,14 +22038,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "orman kullanımı düzenle"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "korunacak doğa alanı"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "korunacak doğa alanı düzenle"
@@ -21725,25 +22053,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr "Taşlık Alan"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr "Taşlık Alan Düzenle"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr "Çalılık"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr "Çalılık Düzenle"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr "Dağ Eteği"
@@ -21751,10 +22079,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr "Dağ Eteği Kullanımı"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr "Sağlıksız Ağaç"
@@ -21762,5 +22090,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr "Sağlıksız Ağaç Düzenle"
@@ -21768,5 +22096,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr "Çiftlik"
@@ -21775,45 +22103,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr "Çiftlik Kullanımı Düzenle"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr "Çiftlik Arazisi"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr "Çiftlik Arazisi Kullanımı Düzenle"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr "Bağ"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr "Bağ Kullanımı Düzenle"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr "Kiralık Tarım Alanı"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr "Kiralık Tarım Alanı Düzenle"
@@ -21821,25 +22149,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "Bahçe"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "Bahçe Düzenle"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "Otlak"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr "Otlak Kullanım Düzenle"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr "Köy Yerleşimi"
@@ -21847,10 +22175,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr "Köy Yerleşimi Düzenle"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr "Genel"
@@ -21858,20 +22186,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr "Genel Düzenle"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr "Park Düzenle"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr "oyun alanı"
@@ -21879,5 +22207,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr "oyun alanı kullanımı düzenle"
@@ -21885,15 +22213,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr "Yerleşim Alanı"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr "Yerleşim Alanı Kullanımı Düzenle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr "Mezarlık"
@@ -21901,9 +22229,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr "Mezarlık Düzenle"
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr "Mezarlık"
@@ -21911,39 +22239,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr "Mezarlık Kullanımı Düzenle"
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr "Perakende"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr "Perakende Alan Kullanımı Düzenle"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr "Ticari"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr "Ticari Alan Kullanımı Düzenle"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr "Endüstriyel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr "Endüstriyel Alan Kullanımı Düzenle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr "Demiryolu alanı"
@@ -21951,15 +22279,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr "Demiryolu alanı kullanımı düzenle"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr "Askeri"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr "Askeri Alan Düzenle"
@@ -21967,55 +22295,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr "İnşaat Alanı"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr "İnşaat Alanı Düzenle"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr "Ağaçsız_Alan"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr "Ağaçsız_Alan Kullanımı Düzenle"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr "Yeşil Alan"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr "yeşil Alan kullanımı düzenle"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr "Toprak Dolum"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr "Toprak Dolum Alanı Düzenle"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr "Taşocağı"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr "taşocağı Düzenle"
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr ""
@@ -22025,5 +22353,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr ""
@@ -22032,10 +22360,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr ""
@@ -22043,5 +22371,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr ""
@@ -22050,5 +22378,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -22056,34 +22384,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr ""
@@ -22092,15 +22420,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr ""
@@ -22108,5 +22436,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22115,5 +22443,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22121,5 +22449,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22191,5 +22519,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22198,17 +22526,17 @@
 msgstr "bisiklet"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "otobüs"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22261,5 +22589,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22268,13 +22596,13 @@
 msgstr "ayak"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr ""
@@ -22288,10 +22616,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr ""
@@ -22299,31 +22627,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr ""
@@ -22332,30 +22660,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22793,11 +23121,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr "kırılmış"
@@ -24821,5 +25149,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr "su_lambası"
@@ -25491,4 +25819,12 @@
 #.
 #. <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"/>
@@ -25513,5 +25849,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr "tarihi"
@@ -25525,5 +25861,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr "taş_ocağı"
@@ -25537,5 +25873,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr "toprak_doldurma"
@@ -25557,5 +25893,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr "havza"
@@ -25569,5 +25905,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr "orman"
@@ -25581,5 +25917,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr "çiftlik"
@@ -25602,5 +25938,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr "perakende"
@@ -25614,5 +25950,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr "endüstri"
@@ -25626,5 +25962,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr "ağaçsız_alan"
@@ -25638,5 +25974,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr "yeşil_alan"
@@ -25650,5 +25986,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr "demiryolu"
@@ -25705,7 +26041,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr "askeri"
@@ -25719,5 +26055,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr "mezarlık"
@@ -25730,5 +26066,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr "zirve"
@@ -25743,5 +26079,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr "buzul"
@@ -25755,5 +26091,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr "volkanik"
@@ -25808,8 +26144,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr "doğal"
@@ -25823,5 +26159,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr "çalılık"
@@ -25835,5 +26171,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr "çalılık"
@@ -25847,8 +26183,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "alan"
+msgstr ""
 
 #. color water
@@ -25860,5 +26195,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr "çamur"
@@ -25872,5 +26207,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr "sahil"
@@ -25948,8 +26283,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr "rut"
@@ -25997,7 +26332,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr "sınırlar"
@@ -26147,11 +26482,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr "yer"
@@ -26199,6 +26534,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr "adres"
@@ -26506,25 +26841,58 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Sayfa {0} yüklerken hata oluştu"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Yardım sayfası yok. <A HREF=\"{0}\">English</A> olarak oluştur."
+#~ msgid "File could not be found."
+#~ msgstr "Dosya bulunamadı."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Lütfen en az bir indirme görevi seçiniz"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "İlişkilerde Karışıklık"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Ayrıştırma esnasında hata"
+
+#~ msgid "File not found"
+#~ msgstr "Dosya bulunamadı"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "lütfen ilk olarak istenilen koordinatı giriniz."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "İlk olarak sık kullanılanlardan bir yer seçiniz."
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Lütfen aranacak bir metin giriniz"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Arama sonucu server dan alınamadı"
+
+#~ msgid "name"
+#~ msgstr "sism"
+
+#~ msgid "zoom"
+#~ msgstr "yaklaş"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Kopyalamak için bir satır seçiniz."
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "Yardım sayfası yok. <A HREF=\"{0}\">English</A> ya da <A HREF=\"{1}"
-#~ "\">türkçe</A> olarak oluştur."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Sadece JOSM Online Yardım dosyalaları düzenlenebilir"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "''{1}'' gurubu için ''{0}'' kullan"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "''{0}'' ı kullan"
+#~ "(Bu uyarı yapıldıktan sonraki gün sayısını 'pluginmanager.warntime' dan "
+#~ "değiştirebilirsin.<br>"
+
+#~ msgid "Request Update"
+#~ msgstr "Güncelleme İste"
+
+#~ msgid "error loading metadata"
+#~ msgstr "meta veri yüklemesinde hata"
+
+#~ msgid "requested: {0}"
+#~ msgstr "istendi: {0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "güncelleme isteğinde hata"
 
 #~ msgid ""
@@ -26558,7 +26926,4 @@
 #~ msgstr "Aktarım hata nedeniyle kesildi (5 sn bekle):"
 
-#~ msgid "Aborting..."
-#~ msgstr "İptal Edildi..."
-
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr "İpucu: Bazı değişiklikler server'a yükleme yapıldıktan sonra geldi."
@@ -26566,4 +26931,10 @@
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
 #~ msgstr "Fare veya Ctrl+ok tuşları ile /./  zoom ve pan yapabilirsin."
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "''{1}'' gurubu için ''{0}'' kullan"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "''{0}'' ı kullan"
 
 #~ msgid "Occupied By"
@@ -26604,7 +26975,4 @@
 #~ msgid "Authors: {0}"
 #~ msgstr "Yazarlar: {0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Seçim listesini yenile."
 
 #~ msgid "Merging conflicts."
@@ -26677,8 +27045,4 @@
 #~ msgid "their version:"
 #~ msgstr "onların versiyonu:"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Eklenti güncelledi. Programı yeniden açınız."
 
 #~ msgid "Could not download plugin: {0} from {1}"
@@ -26948,4 +27312,10 @@
 #~ msgstr "Tarayıcında Aç"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Sadece JOSM Online Yardım dosyalaları düzenlenebilir"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Sayfa {0} yüklerken hata oluştu"
+
 #~ msgid "Merge nodes with different memberships?"
 #~ msgstr "Farklı üyelik olan noktaları birleştirmek istiyor musun?"
@@ -26966,2 +27336,12 @@
 #~ msgid "Only one node selected"
 #~ msgstr "Sadece bir nokta seçili"
+
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Yardım sayfası yok. <A HREF=\"{0}\">English</A> olarak oluştur."
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Yardım sayfası yok. <A HREF=\"{0}\">English</A> ya da <A HREF=\"{1}"
+#~ "\">türkçe</A> olarak oluştur."
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 18273)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 18508)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-25 13:10+0100\n"
-"PO-Revision-Date: 2009-10-17 14:47+0000\n"
+"POT-Creation-Date: 2009-11-08 14:27+0100\n"
+"PO-Revision-Date: 2009-10-25 13:38+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,68 +16,68 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-10-25 12:06+0000\n"
+"X-Launchpad-Export-Date: 2009-11-08 12:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/Main.java:207
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
 msgid "Creating main GUI"
 msgstr "建立主視窗中"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:217
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:447
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:86
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:441
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:188
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "說明"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:416
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "忽略不正確的 URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:417
-#: ../core/src/org/openstreetmap/josm/Main.java:436
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:61
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:260
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:143
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:265
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:122
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1403
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1431
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:377
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:358
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:765
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
@@ -90,12 +90,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:76
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
@@ -105,27 +99,26 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:435
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "忽略格式不良的檔案 URL： \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:448
-#: ../core/src/org/openstreetmap/josm/Main.java:456
-#: ../core/src/org/openstreetmap/josm/Main.java:480
-#: ../core/src/org/openstreetmap/josm/Main.java:488
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/Main.java:464
+#: ../core/src/org/openstreetmap/josm/Main.java:472
+#: ../core/src/org/openstreetmap/josm/Main.java:503
+#: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
-#: ../core/src/org/openstreetmap/josm/Main.java:457
-#: ../core/src/org/openstreetmap/josm/Main.java:481
-#: ../core/src/org/openstreetmap/josm/Main.java:489
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:215
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -133,23 +126,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:38
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:48
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:68
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:407
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:418
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:441
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:57
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:405
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:795
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:749
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:812
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1038
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -157,5 +151,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:161
-#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:738
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:648
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:656
@@ -164,21 +158,22 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:127
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:58
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:168
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:182
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:342
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:70
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:412
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:601
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:614
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:732
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:951
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:611
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:624
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:742
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:964
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -187,5 +182,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
@@ -198,17 +193,9 @@
 msgstr "錯誤"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
-msgid "UNKNOWN"
-msgstr "不明"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "About"
 msgstr "關於"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
 msgid "Display the about screen."
 msgstr "顯示「關於」畫面。"
@@ -216,37 +203,37 @@
 #. 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:133
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:645
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:647
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
 msgstr "Java OpenStreetMap 編輯器"
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:76
 #, java-format
 msgid "Version {0}"
 msgstr "版本 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../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:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
 #, java-format
 msgid "Java Version {0}"
 msgstr "上次修改 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
 msgid "Homepage"
 msgstr "首頁"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
 msgid "Bug Reports"
 msgstr "程式臭蟲回報"
@@ -256,5 +243,5 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
@@ -262,33 +249,29 @@
 msgstr "資訊"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
 msgid "Readme"
 msgstr "讀我檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
 msgid "Revision"
 msgstr "重訂版本"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
 msgid "Contribution"
 msgstr "貢獻者"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
 msgid "License"
 msgstr "授權"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:247
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
 msgid "Plugins"
 msgstr "外掛"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
 msgid "About JOSM..."
 msgstr "關於 JOSM"
-
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
-msgid "File could not be found."
-msgstr "找不到檔案"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
@@ -319,42 +302,41 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../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:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:248
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:296
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:249
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:171
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1169
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:739
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:278
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:288
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -362,5 +344,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
@@ -373,19 +355,19 @@
 msgstr "請至少選擇一個已上傳的節點、路徑或關係。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:68
 msgid "Please select the target layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 msgid "Select target layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
 #, java-format
 msgid ""
@@ -394,50 +376,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:87
 msgid "No target layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:60
 msgid "Add Node..."
 msgstr "新增節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 msgid "Add a node by entering latitude and longitude."
 msgstr "由經緯度新增節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../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:32
+#: ../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:19
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 #, java-format
 msgid "Edit: {0}"
 msgstr "編輯: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Enter the coordinates for the new node."
 msgstr "輸入新節點的座標"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
 msgid "Use decimal degrees."
 msgstr "使用十進位度數"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:46
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "負數表示西半球/南半球"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:49
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
@@ -446,5 +428,5 @@
 msgstr "緯度"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:52
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
@@ -453,27 +435,27 @@
 msgstr "經度"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
+#: ../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:36
+#: ../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:37
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -483,5 +465,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -497,30 +479,28 @@
 msgstr "工具：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
+#: ../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:138
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:69
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:188
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
+#: ../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:137
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:189
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:336
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:657
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -530,84 +510,84 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
+#: ../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:32
+#: ../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:64
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
+#: ../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:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "data"
 msgstr "資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "layer"
 msgstr "圖層"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "selection"
 msgstr "選取"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
 msgid "conflict"
 msgstr "衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
 msgid "download"
 msgstr "下載"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "縮放至 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "將檢視縮放至 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 #, java-format
 msgid "View: {0}"
 msgstr "檢視：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "Nothing selected to zoom to."
 msgstr "沒有選擇要縮放的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:136
 msgid "No conflicts to zoom to"
 msgstr "沒有要縮放的衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
 msgid "Close open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
 msgid "Closes open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
+#: ../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:120
 #, java-format
@@ -615,37 +595,37 @@
 msgstr "檔案: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
 msgid "There are no open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:60
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "No open changesets"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
 msgid "Downloading open changesets ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:48
 #: ../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:48
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
 msgid "Combine several ways into one."
 msgstr "合併多個路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
 msgid "Change directions?"
 msgstr "改變路徑方向?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 msgid "Reverse and Combine"
 msgstr "反轉後組合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -653,5 +633,5 @@
 msgstr "以這些路徑目前的方向是不能組合的。是否要將它們中的一部分反轉？"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -659,41 +639,41 @@
 msgstr "不能組合路徑（它們無法合併為節點的單一字串）"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:164
 #, java-format
 msgid "Combine {0} ways"
 msgstr "組合 {0} 條路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:189
 msgid "Please select at least two ways to combine."
 msgstr "請選擇至少兩個以上的路徑來合併"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 msgid "Copy"
 msgstr "複製"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
 msgid "Copy selected objects to paste buffer."
 msgstr "複製選取的物件到剪貼簿"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
 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:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:275
 msgid "Create Circle"
 msgstr "建立圓形"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 msgid "Create a circle from three selected nodes."
 msgstr "從三個選取的節點建立圓形。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
 msgid "Those nodes are not in a circle. Aborting."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:268
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -701,16 +681,14 @@
 msgstr "請正確的選擇二或三個節點或一條只有二或二個節點的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
 #: ../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:95
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:427
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:384
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:866
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
@@ -722,5 +700,5 @@
 msgstr "刪除"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
 msgid "Delete selected objects."
 msgstr "刪除選擇的物件"
@@ -728,6 +706,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
+#: ../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:207
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
@@ -741,73 +719,50 @@
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
+#: ../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:30
+#: ../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:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download from OSM..."
 msgstr "從 OSM 下載"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:32
 msgid "Download map data from the OSM server."
 msgstr "從 OSM 主機下載圖資"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
-msgid "Download"
-msgstr "下載"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:68
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:270
-#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
-msgid "OK"
-msgstr "確定"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
-msgid "Please select at least one task to download"
-msgstr "請選擇至少一項要下載的工作"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
 msgid "Download parent ways/relations..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:40
 msgid "Download primitives referring to one of the selected primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#, java-format
+msgid "Id > 0 required, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:153
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:181
-#, java-format
-msgid "Id > 0 required, got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:179
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:183
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:185
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:237
-#: ../core/src/org/openstreetmap/josm/command/Command.java:66
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:74
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:90
+#: ../core/src/org/openstreetmap/josm/command/Command.java:67
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:88
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:217
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:50
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:59
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
@@ -816,39 +771,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:227
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1430
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
 #, java-format
 msgid "There were {0} conflicts during import."
 msgstr "匯入時有 {0} 個衝突。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:230
 msgid "Conflicts during download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
 #, java-format
 msgid "({0}/{1}) Loading parents of node {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
 #, java-format
 msgid "({0}/{1}) Loading parents of way {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:257
 #, java-format
 msgid "({0}/{1}) Loading parents of relation {2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
 msgid "Duplicate"
 msgstr "重製"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "重製會複製選擇區域並立即貼上。"
@@ -858,41 +813,41 @@
 #. <action class="SetWaypointAction" params="Info"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:22
 #: ../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:22
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
 msgid "Exit the application."
 msgstr "離開程式"
 
-#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:198
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:236
 msgid "All Formats"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
 msgid "Export to GPX..."
 msgstr "匯出到 GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
 msgid "Export the data to GPX file."
 msgstr "匯出資料到 GPX 檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 msgid "Nothing to export. Get some data first."
 msgstr "沒有東西可匯出。請先取得一些資料。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:118
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:198
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:200
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:298
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
@@ -931,6 +886,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
@@ -949,9 +904,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:132
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:97
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:99
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:57
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
@@ -971,5 +926,5 @@
 msgstr "參數「{0}」必須不為空值(null)"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
@@ -977,36 +932,36 @@
 msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
 msgid "Export GPX file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
+#: ../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:16
+#: ../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:15
-#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
+#: ../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:16
+#: ../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/JoinNodeWayAction.java:29
 #: ../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:29
+#: ../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:72
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:74
 msgid "Join Node and Line"
 msgstr "連結節點與直線"
@@ -1016,168 +971,186 @@
 msgstr "沒有捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
 msgid "Merge layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#: ../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:43
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:48
 msgid "Merge Nodes"
 msgstr "合併節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 msgid "Merge nodes into the oldest one."
 msgstr "將節點合併到最舊的一個中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 msgid "Please select at least two nodes to merge."
 msgstr "請至少選取兩個節點來合併"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:165
-msgid "Cannot merge nodes: Would have to delete a way that is still used."
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:153
+#, fuzzy
+msgid "Abort Merging"
+msgstr "正在中止..."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:155
+msgid "Click to abort merging nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
+#, fuzzy, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr "不能合併節點。會刪除仍在使用的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:261
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:266
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "合併 {0} 個節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../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:21
+#: ../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:33
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
+#: ../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:33
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
 msgstr "鏡射選取的節點和路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "上"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "移動物件 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "下"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "左"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "右"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "移動 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "移動物件 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
 msgid "Cannot move objects outside of the world."
 msgstr "不能將物件移動到世界外頭"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../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:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:626
 msgid "New"
 msgstr "新增"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
 msgid "Create a new map."
 msgstr "建立新地圖"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:38
 msgid "Open..."
 msgstr "開啟..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
 msgid "Open a file."
 msgstr "開啟檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:69
 msgid "Opening files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:88
 #, java-format
 msgid "Opening file ''{0}'' ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:37
+#: ../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:36
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
 msgid "Open an URL."
 msgstr "開啟 URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
 msgid "Separate Layer"
 msgstr "另外的圖層"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded in a new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
 msgid "Enter URL to download:"
 msgstr "輸入要下載的 URL："
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
 msgid "Enter an URL from where data should be downloaded"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
 msgid "Download Location"
 msgstr "下載位置"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
 msgid "Download URL"
 msgstr "下載 URL"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
 msgid "Start downloading data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+#, fuzzy
+msgid "Download Data"
+msgstr "正在下載資料"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
 msgid "Orthogonalize Shape"
 msgstr "形狀直角化"
@@ -1187,18 +1160,18 @@
 msgstr "移動節點讓所有角度成為 90 或 270 度"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+msgid "Orthogonalize Shape / Undo"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
-msgid "Orthogonalize Shape / Undo"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 msgid "Undo orthogonalization for certain nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
 msgid "Orthogonalize / Undo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1207,9 +1180,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
 msgid "Undo Orthogonalize Shape"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1218,36 +1191,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:173
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
 msgid "Usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:344
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
 msgid "Orthogonalize"
 msgstr "直角化"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
 msgid "Paste"
 msgstr "貼上"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
 msgid "Paste contents of paste buffer."
 msgstr "從剪貼緩衝區貼上內容。"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../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:32
+#: ../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:107
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
 #, java-format
 msgid "Pasting {0} tag"
@@ -1256,5 +1230,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
 #, java-format
 msgid "to {0} primitive"
@@ -1263,59 +1237,59 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Preferences..."
 msgstr "偏好設定..."
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
 msgid "Open a preferences page for global settings."
 msgstr "開啟偏好全域設定設定頁面"
 
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:51
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 msgid "Redo the last undone action."
 msgstr "重做上次復原的動作。"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "同時重新命名該檔案"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "反轉路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 msgid "Reverse the direction of all selected ways."
 msgstr "反轉所有選取路徑的方向。"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
 msgid "Please select at least one way."
 msgstr "請選擇至少一條路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
 msgid "Reverse ways"
 msgstr "反轉路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../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:63
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
@@ -1323,10 +1297,10 @@
 msgstr "存檔"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
 msgid "Save the current data."
 msgstr "儲存現在的資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
 #, java-format
 msgid "File {0} exists. Overwrite?"
@@ -1375,21 +1349,21 @@
 msgstr "儲存圖層"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:272
 msgid "Save As..."
 msgstr "另存檔案..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
 msgid "Save the current data to a new file."
 msgstr "將目前的資料儲存為新的檔案。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "全選"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1397,28 +1371,28 @@
 msgstr "選擇資料圖層中所有取消刪除的物件。這樣也會選擇不完整的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show Status Report"
 msgstr "顯示狀態報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
 msgid "Show status report with useful information that can be attached to bugs"
 msgstr "顯示有與程式錯誤相關資訊的狀態報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:40
 #, java-format
 msgid "Help: {0}"
 msgstr "求助：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:105
 msgid "Status Report"
 msgstr "狀態報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
 msgid "Copy to clipboard and close"
 msgstr "複製到剪貼簿並關閉"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:106
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:978
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
@@ -1427,23 +1401,23 @@
 msgstr "關閉"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "切割路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "在選取的節點上切割路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
 msgid "The current selection cannot be used for splitting."
 msgstr "不能在選取的節點上切割路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
 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] "選取的節點不在任何路徑上"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:139
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1454,19 +1428,19 @@
 msgstr[0] "節點上不只有兩個路徑。請同時選取你想切割的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
 msgid "The selected nodes do not share the same way."
 msgstr "選取的節點不在同一個路徑上。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:167
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
 msgstr[0] "選取的路徑未包含選取的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
 msgid "You must select two or more nodes to split a circular way."
 msgstr "你必須選擇兩個以上的節點來切割一個環狀路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1491,70 +1465,70 @@
 msgstr "將路徑 {0} 分割為 {1} 個部分"
 
-#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../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:15
+#: ../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:15
+#: ../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:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "取消黏合路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "重製由多條路徑使用的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:84
 msgid "This node is not glued to anything else."
 msgstr "這個節點並未黏合到其他項目上。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 msgid "None of these nodes are glued to anything else."
 msgstr "這些節點沒有一個黏合到其他項目上。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:111
 msgid "None of this way's nodes are glued to anything else."
 msgstr "這個路徑的節點沒有一個黏合到其他項目上。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "The current selection cannot be used for unglueing."
 msgstr "目前的選擇區域不能用於取消黏合。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "Select either:"
 msgstr "選擇其一："
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One tagged node, or"
 msgstr "* 一個有標籤的節點，或"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way, or"
 msgstr "* 一個用於多條路徑的節點，或"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 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:124
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 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:125
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 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:127
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:129
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1567,9 +1541,9 @@
 "都會被選取。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:172
 msgid "Unglued Node"
 msgstr "取消黏合節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:385
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1577,80 +1551,81 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:409
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:23
 #: ../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:23
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
 msgid "Undo the last action."
 msgstr "復原最後的動作。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
+#: ../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
 msgid "Unselect All"
 msgstr "取消全選"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
 msgid "Unselect all objects."
 msgstr "取消選擇所有的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 msgid "Unselect All (Focus)"
 msgstr "取消全選（焦點）"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
 msgid "Unselect All (Escape)"
 msgstr "取消全選（跳出）"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
 msgid "Update data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-msgid "Updates the objects in the current data layer from the server."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#, fuzzy
+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:81
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
-msgid "Updating data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:945
+msgid "Download data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "No current dataset found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Update selections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
 msgid "Update Selection"
 msgstr "更新選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
 msgid "There are no selected primitives to update."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
 msgid "Selection empty"
 msgstr "選擇區域是空的"
@@ -1662,8 +1637,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-msgid "Upload all changes in the current data layer to the OSM server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:141
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
 #, java-format
 msgid ""
@@ -1672,5 +1647,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
@@ -1678,29 +1653,29 @@
 msgstr "沒有要上傳的變更。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
 msgid "Nothing to upload. Get some data first."
 msgstr "沒有要上傳的項目。請先取得一些資料。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
 #, java-format
 msgid "Synchronize node {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
 #, java-format
 msgid "Synchronize way {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
 #, java-format
 msgid "Synchronize relation {0} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:242
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:290
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
 msgid "Synchronize entire dataset"
 msgstr "同步整個資料組"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
 #, java-format
 msgid ""
@@ -1714,11 +1689,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:313
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:374
 msgid "Conflicts detected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
 #, java-format
 msgid ""
@@ -1732,5 +1707,5 @@
 "<strong>{1}</strong>則會放棄並繼續編輯。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:331
 #, java-format
 msgid ""
@@ -1740,23 +1715,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:338
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:339
 msgid "Changeset closed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
 msgid "Prepare conflict resolution"
-msgstr "衝突的決議"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:353
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
 #, java-format
 msgid "Click to download all parent ways for node {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
 msgid "Click to cancel and to resume editing the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
 #, java-format
 msgid ""
@@ -1767,47 +1741,52 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:374
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
 msgid "Node still in use"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:429
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
+#, java-format
+msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:530
+msgid "Updating primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:587
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr ""
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:618
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:619
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:636
 #, fuzzy, java-format
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr "警告：錯誤的標頭「{0}」與預期的樣式「{1}」不符"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:515
-#, java-format
-msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
-msgid "Upload to OSM API failed"
-msgstr "上傳至 OSM API 失敗"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:547
-msgid "Updating primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:604
-#, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr ""
-
-#. we tried to delete an already deleted primitive.
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:635
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:92
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:46
+msgid "Uploading {0} objects ..."
+msgstr "改變 {0} 個物件"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
 msgid "Upload selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
 msgstr ""
@@ -1826,11 +1805,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:17
 msgid "Zoom In"
 msgstr "拉近"
 
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:17
 msgid "Zoom Out"
 msgstr "拉起"
@@ -1910,21 +1889,17 @@
 msgstr "慢速快轉"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:34
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:50
 msgid "Downloading GPS data"
 msgstr "正在下載 GPS 資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:57
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:77
 msgid "Downloaded GPX Data"
 msgstr "已下載的 GPX 資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:87
-msgid "Raw GPS data"
-msgstr "原始 GPS 資料"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:52
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
 msgid "Downloading data"
 msgstr "正在下載資料"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:62
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
 #, java-format
 msgid ""
@@ -1932,27 +1907,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
 msgid "No data found in this area."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
-msgid "OpenStreetMap data"
-msgstr "OpenStreetMap 資料"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
+#: ../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:111
-#, java-format
-msgid "The following errors occurred during mass download:{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:113
-msgid "Errors during Download"
-msgstr "下載時發生錯誤"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:210
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
+#, fuzzy
+msgid "Check on the server"
+msgstr "可視的（在伺服器上）"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
+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:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
+msgid "Ignore"
+msgstr "忽略"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
+#, fuzzy
+msgid "Click to abort and to resume editing"
+msgstr "按這裡刪除目的地。"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
 msgid ""
@@ -1964,7 +1951,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:226
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:252
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:93
+msgid "Errors during Download"
+msgstr "下載時發生錯誤"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:116
+#, fuzzy
+msgid "Errors during download"
+msgstr "下載時發生錯誤"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
@@ -1986,5 +1988,5 @@
 msgstr "模式：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:273
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -2014,38 +2016,38 @@
 msgstr "已選取"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
 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:536
 msgid "Add node"
 msgstr "加入節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
 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:547
 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:549
 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:551
 msgid "Add node into way and connect"
 msgstr "將節點加入路徑並連接"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
 msgid "Create new node."
 msgstr "建立新的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
 msgid "Select node under cursor."
 msgstr "選取游標下的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:940
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 #, java-format
 msgid "Insert new node into way."
@@ -2053,14 +2055,14 @@
 msgstr[0] "插入新的節點到{0} 路徑中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Start new way from last node."
 msgstr "從最後的節點開始新的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:952
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Continue way from last node."
 msgstr "從最後的節點繼續路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:964
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:975
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:971
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:982
 msgid "Finish drawing."
 msgstr "結束繪製。"
@@ -2080,5 +2082,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "放開滑鼠按鈕以選擇矩形內的物件。"
@@ -2089,5 +2091,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "放開滑鼠按鈕以停止旋轉。"
@@ -2147,10 +2149,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 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:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2162,4 +2164,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:422
 msgid "Zoom"
 msgstr "縮放"
@@ -2179,5 +2182,4 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:45
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "搜尋..."
@@ -2280,42 +2282,49 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
+#, fuzzy
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr "<b>節點數：</b>... - 含有此數目節點的物件"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>修改過</b> - 所有改變過的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>選取的</b> - 所有選取的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>不完整</b> - 所有不完整的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>未標籤的</b> - 所有未標籤的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>expr</i></b> - 所有物件的子項符合正規表示式的"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>expr</i></b> - 所有物件父項符合正規表示式的"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 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:121
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "使用 <b>\"</b> 將運算子包覆 (例如當設定鍵含有 :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "使用 <b>(</b> 和 <b>)</b> 將正規表示式群組起來"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
@@ -2325,51 +2334,51 @@
 msgstr "過濾條件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
 msgid "Search"
 msgstr "搜尋"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Submit filter"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "Start Search"
 msgstr "開始搜尋"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:253
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "找不到「{0}」的符合項"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:255
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:256
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:257
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "搜尋「{0}」的結果沒有任何項目可自選擇區域移除"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:259
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:269
 #, java-format
 msgid "Found {0} matches"
 msgstr "找到 {0} 個符合項"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:296
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:298
 msgid "RX"
 msgstr "RX"
@@ -2400,26 +2409,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:547
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "未預期的記號：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:538
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:567
 msgid "Missing arguments for or."
 msgstr "沒有 or 所需的引數。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:548
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:577
 msgid "Missing argument for not."
 msgstr "沒有 not 所需的引數。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:558
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:587
 msgid "Expected closing parenthesis."
 msgstr "需要關閉括弧。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:620
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:649
+#, fuzzy
+msgid "Wrong number of parameters for tags operator."
+msgstr "給 nodes 運算子錯誤的參數數量。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:651
+#, fuzzy, java-format
+msgid ""
+"Incorrect value of tags operator: {0}. Tags operator expects number of tags "
+"or range, for example tags:1 or tags:2-5"
+msgstr ""
+"nodes 運算子的數值錯誤：{0}。nodes 運算子應使用節點的數量或範圍，例如 "
+"nodes:10-20"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
 msgid "Wrong number of parameters for nodes operator."
 msgstr "給 nodes 運算子錯誤的參數數量。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:622
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
 #, java-format
 msgid ""
@@ -2430,5 +2453,5 @@
 "nodes:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:629
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:670
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
@@ -2523,4 +2546,20 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1135
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:280
+#: ../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/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "確定"
+
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
 #, java-format
@@ -2538,8 +2577,8 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:50
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#, java-format
 msgid "Added {0} objects"
-msgstr "改變 {0} 個物件"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2619,5 +2658,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Double conflict"
 msgstr ""
@@ -2653,4 +2692,15 @@
 msgstr "不能未決定的衝突"
 
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:58
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:104
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' must not be empty"
+msgstr "參數「{0}」必須不為空值(null)"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:60
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:106
+msgid "At least one object to delete requird, got empty collection"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
 #, java-format
@@ -2681,29 +2731,6 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:251
-msgid "Conflicting relation"
-msgstr "衝突的關係"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:252
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
-msgid "Delete from relation"
-msgstr "自關係中刪除"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:258
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
-"from relation?</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:269
-#, java-format
-msgid ""
-"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
-"</html>"
-msgstr ""
-
 #. FIXME: relation memberships are not handled
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:475
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
 msgid "Split way segment"
 msgstr "分割路徑區段"
@@ -2711,6 +2738,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:499
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:139
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:140
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2721,5 +2748,5 @@
 "看到的）可能會使用它們。<br>確定要刪除嗎？"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:507
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:464
 msgid "Delete confirmation"
 msgstr ""
@@ -2905,15 +2932,30 @@
 msgstr "自動修正標籤"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:52
+#, java-format
+msgid "Expected array of length 4, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:62
+#, java-format
+msgid "Exactly four doubles excpected in string, got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:69
+#, fuzzy, java-format
+msgid "Illegal double value ''{0}''"
+msgstr "預設值是「{0}」。"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:394
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "設定檔案第 {0} 行格式不良"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:403
 #, java-format
 msgid ""
@@ -2922,5 +2964,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
 #, java-format
 msgid ""
@@ -2929,5 +2971,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
 #, java-format
 msgid ""
@@ -2936,5 +2978,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
 #, java-format
 msgid ""
@@ -2943,5 +2985,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
 #, java-format
 msgid ""
@@ -2949,5 +2991,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:432
 #, java-format
 msgid ""
@@ -2956,5 +2998,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
 #, java-format
 msgid ""
@@ -2963,5 +3005,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
 #, java-format
 msgid ""
@@ -2970,5 +3012,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
 msgid ""
@@ -2977,19 +3019,42 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "偏好設定儲存於 {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "無法上傳偏好設定。理由：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
 msgid "Could not load preferences from server."
 msgstr "無法從伺服器載入偏好設定。"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
 #, java-format
 msgid ""
@@ -2998,5 +3063,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#: ../core/src/org/openstreetmap/josm/data/Version.java:46
+#, java-format
+msgid "Failed to load load resource ''{0}''. Error is {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:93
+#: ../core/src/org/openstreetmap/josm/data/Version.java:156
+msgid "UNKNOWN"
+msgstr "不明"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:107
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:140
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3018,20 +3103,20 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:56
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:75
 msgid "S"
 msgstr "南"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:57
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
 msgid "N"
 msgstr "北"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:70
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgid "W"
 msgstr "西"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:71
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgid "E"
 msgstr "東"
@@ -3042,4 +3127,18 @@
 #, java-format
 msgid "Changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:182
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it's already included"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:631
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it's 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 ""
 
@@ -3107,14 +3206,14 @@
 msgstr "警告：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:167
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:190
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:299
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:322
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:355
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:378
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:64
 #, java-format
@@ -3122,5 +3221,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:357
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:380
 #, java-format
 msgid "Version > 0 expected. Got {0}."
@@ -3147,6 +3246,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:257
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:277
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:297
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3206,113 +3305,113 @@
 msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:255
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:260
 msgid "Area style way is not closed."
 msgstr "區域類型的路徑並未封閉。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:492
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:493
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "多邊形路徑「{0}」並未封閉。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:860
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:942
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "關係中已刪除的成員「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "路徑「{0}」少於兩個節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
 msgid "More than one \"from\" way found."
 msgstr "找到一個以上「從」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
 msgid "More than one \"to\" way found."
 msgstr "找到一個以上「到」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:623
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:637
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
 msgid "More than one \"via\" found."
 msgstr "找到一個以上的「經過」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:628
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:642
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明的角色「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:645
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "「{0}」的不明成員類型。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:651
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
 msgid "No \"from\" way found."
 msgstr "找不到「從」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:655
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"to\" way found."
 msgstr "找不到「到」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:659
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"via\" node or way found."
 msgstr "找到一個以上「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:668
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "「從」路徑沒有開始或結束於「經過」節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:672
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "「到」路徑沒有開始或結束於「經過」節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:699
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:688
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "「從」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:703
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:692
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "「到」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:826
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:815
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "找不到限制 {0} 的樣式"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:880
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:909
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "路徑「{0}」和「{1}」之間的十字路。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:921
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "內部路徑「{0}」在外。"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:958
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "路徑「{1}」沒有有用的角色「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:892
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:970
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "多邊形中有非-路徑「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:950
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1014
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "多邊形「{0}」沒有外部路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1039
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "路徑「{0}」和「{1}」之間的十字路。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1051
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "內部路徑「{0}」在外。"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1083
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "內部路徑「{0}」的樣式等同多邊形。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1130
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1113
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
@@ -3328,11 +3427,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1423
-#, fuzzy
 msgid "areatext"
-msgstr "文字"
+msgstr ""
 
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:245
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:251
 #, java-format
 msgid ""
@@ -3348,5 +3446,4 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
@@ -3356,5 +3453,4 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:563
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
@@ -3381,5 +3477,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:173
 msgid "background"
 msgstr "背景"
@@ -3413,12 +3509,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
-#, fuzzy
 msgid "Lambert 4 Zones (France)"
-msgstr "Lambert Zone (法國)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:166
-#, fuzzy
 msgid "Lambert CC9 Zone (France)"
-msgstr "Lambert Zone (法國)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
@@ -3454,10 +3548,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#: ../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 ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3486,5 +3580,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "railway"
 msgstr "鐵路"
@@ -3501,4 +3595,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -3512,33 +3608,33 @@
 msgstr[0] "{0} 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:72
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:105
 msgid "Security exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:95
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
 msgid "Network exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:107
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
 msgid "IO Exception"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
 msgid "Internal Server Error"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:174
 msgid "Bad Request"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
 msgid "Not Found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:151
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:205
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:121
@@ -3546,16 +3642,16 @@
 msgstr "衝突"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:165
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:223
 msgid "Unknown host"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:324
 msgid "Object deleted"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:446
-#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:88
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:440
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
-#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
 msgstr ""
@@ -3568,4 +3664,9 @@
 msgid "Downloading \"Message of the day\""
 msgstr "正在下載「當天的訊息」"
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+#, fuzzy
+msgid "Click to close the dialog"
+msgstr "關閉這個對話盒"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
@@ -3633,74 +3734,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
 msgid "Username"
 msgstr "使用者名稱"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
 msgid "Password"
 msgstr "密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "usage"
 msgstr "用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "options"
 msgstr "選項"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Show this help"
 msgstr "顯示此說明訊息"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Standard unix geometry argument"
 msgstr "標準 unix 幾何引數"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Download the bounding box"
 msgstr "下載此綁定方塊"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 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:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "開啟檔案(若為 .gpx 則是原始 gps)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Download the bounding box as raw gps"
 msgstr "下載綁定方塊做為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Select with the given search"
 msgstr "選取指定的搜尋"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Launch in maximized mode"
 msgstr "以最大化模式啓動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "Reset the preferences to default"
 msgstr "重設偏好設定為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Set the language."
 msgstr "設定語言。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -3709,9 +3810,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "examples"
 msgstr "範例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3721,25 +3822,25 @@
 "--selection 前載入某些資料"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "要取代 --download=<bbox> 可以指定 osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
 msgid "Activating updated plugins"
 msgstr "使用更新後的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
 msgid "Loading early plugins"
 msgstr "載入較早的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Setting defaults"
 msgstr "設定預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
 msgid "Loading plugins"
 msgstr "正在載入外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -3752,11 +3853,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:591
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:470
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:660
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
@@ -3781,6 +3882,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -3881,25 +3982,22 @@
 msgstr "(沒有物件)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:428
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
 msgid "User:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:329
 msgid "Layer not in list."
 msgstr "圖層不在清單中。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:527
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
-msgid "Error while parsing"
-msgstr "分析時發生錯誤"
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
-msgid "File not found"
-msgstr "找不到檔案"
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+#, fuzzy
+msgid "Click to cancel the current operation"
+msgstr "不，取消操作"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3920,5 +4018,5 @@
 msgstr "取消設定：不要在選取的物件上設定這個屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:95
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
@@ -3947,23 +4045,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
-#, fuzzy, java-format
+#, java-format
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] "改變 {0} 個物件"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
-#, fuzzy
 msgid "Delete objects"
-msgstr "刪除選擇的物件"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
-#, fuzzy
 msgid "To delete"
-msgstr "未刪除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
-#, fuzzy
 msgid "From Relation"
-msgstr "關係"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
@@ -3975,5 +4071,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4022,5 +4118,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:229
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:131
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
@@ -4037,5 +4133,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:265
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:141
 msgid "Members"
@@ -4235,8 +4331,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:449
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:639
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4542,6 +4638,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
@@ -4555,6 +4651,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:458
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
@@ -4612,36 +4708,36 @@
 msgstr "他們的資料組合並未包含設定鍵 {0} 的標籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
 msgid "Conflicts when combining primitives"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:134
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:128
-#, java-format
-msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:143
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:281
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../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:339
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:364
 #: ../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:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:365
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:85
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
 msgid "Apply"
 msgstr ""
@@ -4653,5 +4749,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "全部"
@@ -4741,4 +4837,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -4748,4 +4846,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -4758,49 +4857,82 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Remove this relation member from the relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-msgid "Replace"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
-msgid "Replace the way this member refers to with the combined way"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
+msgid "Keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Keep this relation member for the target object"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Undecided"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:42
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:40
 msgid "Not decided yet"
 msgstr ""
 
 #. --- role editing
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:57
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:515
 msgid "Role:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:66
-msgid "Tag modified relations with   "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:69
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+#, fuzzy
+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 ""
+
+#: ../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:71
+#: ../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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
 msgid "Value:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:87
+#: ../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 ""
+
+#: ../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 your 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> them: the combined way will take the "
+"place of the original way in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:132
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether your 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> them: the target node will take the place of the "
+"original node in the membership.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:144
 msgid "Apply this role to all members"
 msgstr ""
@@ -4837,6 +4969,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
@@ -4923,10 +5055,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:578
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
@@ -4993,5 +5122,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:251
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:515
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
@@ -5036,4 +5166,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:492
 msgid "Activate"
 msgstr ""
@@ -5059,6 +5190,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:147
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
 #, java-format
 msgid "This will change up to {0} object."
@@ -5066,22 +5197,22 @@
 msgstr[0] "這會改變 {0} 個物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156
 msgid "An empty value deletes the key."
 msgstr "空白的數值會刪除該設定鍵。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:242
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<不同>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:206
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "是否改變數值？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:271
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5089,69 +5220,73 @@
 msgstr[0] "改變屬性至 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
 msgid "Please select a key"
 msgstr "請選擇一個設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:335
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "請選擇一個數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Please select the objects you want to change properties for."
 msgstr "請選擇您要改變屬性的物件。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
 msgid "Properties/Memberships"
 msgstr "屬性/成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:453
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
 msgid "Properties for selected objects."
 msgstr "選取物件的屬性。"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
 msgid "Member Of"
 msgstr "成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:576
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 msgid "Add Properties"
 msgstr "加入屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:586
 msgid "Add a new key/value pair to all objects"
 msgstr "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
 msgid "Edit Properties"
 msgstr "編輯屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:592
 msgid "Edit the value of the selected key for all objects"
 msgstr "編輯所有物件選取設定鍵的數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:796
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:803
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "屬性：{0} / 成員：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:799
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:806
 msgid "Properties / Memberships"
 msgstr "屬性 / 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:846
 msgid "Change relation"
 msgstr "改變關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:847
+msgid "Delete from relation"
+msgstr "自關係中刪除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:849
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "確定要刪除關係 {0} 的選擇區域？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:860
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:867
 msgid "Delete the selected key in all objects"
 msgstr "刪除所有物件中選取的設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:862
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:869
 msgid "Delete Properties"
 msgstr "删除屬性"
@@ -5159,40 +5294,60 @@
 #. item "Land use/Quarry" text "Name"
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:192
+#: build/trans_presets.java:3151
 msgid "Relations"
 msgstr "關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:81
 msgid "Open a list of all relations."
 msgstr "開啓所有關係的清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:190
 #, java-format
 msgid "Relations: {0}"
 msgstr "關係：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "Open an editor for the selected relation"
 msgstr "開啓選取的關係編輯器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:391
 msgid "Delete the selected relation"
 msgstr "刪除選取的關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:429
 msgid "Create a new relation"
 msgstr "建立新的關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:402
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:442
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:506
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:533
+#, fuzzy
+msgid "Select the members of all selected relations"
+msgstr "刪除選取的關係"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:535
+#, fuzzy
+msgid "Select members"
+msgstr "選擇其一："
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:562
+#, fuzzy
+msgid "Download all members of the selected relations"
+msgstr "刪除選取的關係"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:563
+#, fuzzy
+msgid "Download members"
+msgstr "下載成員"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
@@ -5219,5 +5374,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:287
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:296
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5229,14 +5384,14 @@
 msgstr "選擇區域：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:306
 msgid "Undock the panel"
 msgstr "解鎖面板"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:320
 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:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:331
 msgid "Click to minimize/maximize the panel content"
 msgstr "點選以最小化/最大化面板內容"
@@ -5318,5 +5473,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1399
 msgid "Download relation members"
 msgstr ""
@@ -5346,23 +5502,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1441
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1475
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:171
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:588
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5371,14 +5527,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:596
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:595
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:614
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:618
 #, java-format
 msgid ""
@@ -5388,9 +5544,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:628
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:646
 #, java-format
 msgid ""
@@ -5400,15 +5556,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:709
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:713
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5416,5 +5572,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:771
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5422,20 +5578,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:803
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
 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:806
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:810
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:852
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:844
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:854
 #, java-format
 msgid ""
@@ -5444,67 +5600,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:895
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
 msgid "Move the currently selected members up"
 msgstr "將目前選取的成員上移"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
 msgid "Move the currently selected members down"
 msgstr "將目前選取的成員下移"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:954
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:970
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1051
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1053
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
 msgid "Click to create a conflict and close this relation editor"
-msgstr "接受已解決的衝突並關閉此對話盒"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1057
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1062
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1066
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1069
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5513,9 +5668,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1070
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1086
 #, java-format
 msgid ""
@@ -5524,41 +5679,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1097
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1100
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1133
 msgid "Apply the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1167
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "下載關係中所有不完整的路徑和節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1199
 msgid "Download Members"
 msgstr "下載成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1200
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1231
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1239
 #, java-format
 msgid ""
@@ -5568,17 +5723,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1243
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1236
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1244
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1242
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1250
 msgid "Confirm empty role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1318
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5589,13 +5744,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
 msgid "Zoom to primitive the first selected member refers to"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
 msgid "Zooming disabled because there is no selected member"
 msgstr ""
@@ -5609,14 +5764,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "Value of child.getId() > 0 expected. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
@@ -5666,58 +5821,88 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:39
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr "未連線"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:42
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:45
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:48
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
-msgid "Please enter the desired coordinates first."
-msgstr "請先輸入想要的坐標。"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
-msgid "Please enter a name for the location."
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:148
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:150
+#, java-format
+msgid ""
+"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
+"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:179
+#, fuzzy
+msgid "Create bookmark"
+msgstr "建立邊界"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:181
+#, fuzzy
+msgid "Add a bookmark for the currently selected download area"
+msgstr "將目前選取的成員下移"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#, fuzzy
+msgid "Please enter a name for the bookmarked download area."
 msgstr "請輸入此位置的名稱。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:198
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:252
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
-msgid "Select a bookmark first."
-msgstr "先選擇一個書籤。"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:213
+#, fuzzy
+msgid "Remove the currently selected bookmarks"
+msgstr "將目前選取的成員上移"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:239
+#, fuzzy
+msgid "Rename the currently selected bookmark"
+msgstr "將目前選取的成員上移"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:95
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:97
 msgid "min lon"
 msgstr "最小經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:99
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:101
 msgid "max lon"
 msgstr "最大經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5725,356 +5910,136 @@
 msgstr "www.openstreetmap.org 的 URL (您可以在這裡貼上 URL 下載該區域)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:136
 msgid "Bounding Box"
 msgstr "綁定方塊"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:211
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:253
+#, java-format
+msgid "The string ''{0}'' isn''t a valid double value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:215
+msgid "Value for latitude in range [-90,90] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:257
+msgid "Value for longitude in range [-180,180] required."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:296
+msgid "Paste URL from clipboard"
+msgstr ""
+
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:89
 msgid "Data Sources and Types"
 msgstr "資料來源和類型"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:90
+msgid "OpenStreetMap data"
+msgstr "OpenStreetMap 資料"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:91
+#, fuzzy
+msgid "Select to download OSM data in the selected download area."
+msgstr "在選取的節點上切割路徑"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:93
+msgid "Raw GPS data"
+msgstr "原始 GPS 資料"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:94
+#, fuzzy
+msgid "Select to download GPS traces in the selected download area."
+msgstr "選取的路徑未包含選取的節點。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:114
 msgid "Download as new layer"
 msgstr "下載為新圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
 msgid "Download Area"
 msgstr "下載區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:382
+msgid "Download"
+msgstr "下載"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:208
+#, fuzzy
+msgid "No area selected yet"
+msgstr "尚未選取關係"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:211
 msgid "Download area too large; will probably be rejected by server"
 msgstr "下載區域太大；可能會被伺服器拒絕"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:214
 msgid "Download area ok, size probably acceptable to server"
 msgstr "下載區域確定，大小應該會被伺服器接受"
 
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:367
+msgid "Click to close the dialog and to abort downloading"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:384
+#, fuzzy
+msgid "Click do download the currently selected area"
+msgstr "將目前選取的成員上移"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
+#, fuzzy
+msgid "Please select a download area first."
+msgstr "請選擇要編輯的列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:400
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:80
+msgid "Enter a place name to search for:"
+msgstr "輸入要搜尋位置的名稱："
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:85
+#, fuzzy
+msgid "Enter a place name to search for"
+msgstr "輸入要搜尋位置的名稱："
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:128
+msgid "Areas around places"
+msgstr ""
+
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:220
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "空指標例外(Null pointer exception)，可能遺漏某些標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
-msgid "Please enter a search string"
-msgstr "請輸入搜尋字串"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
-msgid "Cannot read place search results from server"
-msgstr "不能從伺服器讀取位置搜尋結果"
-
-#. this is manually tuned so that it looks nice on a GNOME
-#. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
-msgid "Enter a place name to search for:"
-msgstr "輸入要搜尋位置的名稱："
-
-#. group "Geography"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2783
-msgid "Places"
-msgstr "地名"
-
-#. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-msgid "name"
-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"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-msgid "type"
-msgstr "類型"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
-msgid "near"
-msgstr "靠近"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
-msgid "zoom"
-msgstr "縮放"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-msgid ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Hold left mousebutton and draw a frame."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
-msgid "Slippy map"
-msgstr "快速地圖"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:38
-msgid "zoom level"
-msgstr "縮放等級"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:39
-msgid "x from"
-msgstr "x 軸"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
-msgid "to"
-msgstr "到"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:44
-msgid "y from"
-msgstr "y 軸"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:84
-msgid "Tile Numbers"
-msgstr "拼貼數"
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
-#, java-format
-msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
-msgid "JOSM Help Browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
-#, 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 ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
-#, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check your<br>your internet connection</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
-msgid "Failed to open URL"
-msgstr ""
-
-#. putValue(NAME, tr("Open in Browser"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
-msgid "Open the current help page in an external browser"
-msgstr ""
-
-#. putValue(NAME, tr("Edit"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
-msgid "Edit the current help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
-#, 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 ""
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
-msgid "Reload the current help page"
-msgstr ""
-
-#. putValue(NAME, tr("Back"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
-msgid "Go to the previous page"
-msgstr ""
-
-#. putValue(NAME, tr("Forward"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
-msgid "Go to the next page"
-msgstr ""
-
-#. putValue(NAME, tr("Home"));
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
-msgid "Go to the JOSM help home page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
-msgid "Warning: bad location in HTML document. Exception was: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
-msgid "Failed to open help page. The target URL is empty."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
-msgid "Failed to open help page"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:76
-msgid "Failed to read command. Exiting help browser. Exception was:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
-msgid "Failed to launch the external help browser"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
-msgid "Latitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
-msgid "Longitude: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
-msgid "Coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
-#, java-format
-msgid "History for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
-#, java-format
-msgid "History for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
-#, java-format
-msgid "History for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
-msgid "Close the dialog"
-msgstr "關閉這個對話盒"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-msgid "Reload the history from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
-msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
-#, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
-#, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
-msgid "History not initialized yet. Failed to set current primitive."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
-#, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
-msgid "Load history"
-msgstr "載入歷史紀錄"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
-#, java-format
-msgid "Object id > 0 expected. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
-#, java-format
-msgid "Loading history for node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
-#, java-format
-msgid "Loading history for way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
-#, java-format
-msgid "Loading history for relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "節點 {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:256
+#, fuzzy
+msgid "Search ..."
+msgstr "搜尋..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:258
+#, fuzzy
+msgid "Click to start searching for places"
+msgstr "搜尋陸地的方向"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:298
+msgid "Querying name server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:327
+msgid "Querying name server ..."
 msgstr ""
 
@@ -6432,4 +6397,6 @@
 #. 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" />
@@ -6810,6 +6777,7 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:397
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 #: build/trans_presets.java:78 build/trans_presets.java:114
@@ -6875,11 +6843,11 @@
 #: 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:1856
-#: build/trans_presets.java:1861 build/trans_presets.java:1866
-#: build/trans_presets.java:1873 build/trans_presets.java:1879
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1902 build/trans_presets.java:1911
-#: build/trans_presets.java:1920 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1943
+#: 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
@@ -6889,6 +6857,6 @@
 #: build/trans_presets.java:2009 build/trans_presets.java:2015
 #: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2057
+#: 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
@@ -6898,79 +6866,346 @@
 #: 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:2161
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
 #: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2187
-#: build/trans_presets.java:2195 build/trans_presets.java:2202
-#: build/trans_presets.java:2208 build/trans_presets.java:2215
+#: 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:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2255
-#: build/trans_presets.java:2262 build/trans_presets.java:2270
-#: build/trans_presets.java:2302 build/trans_presets.java:2307
-#: build/trans_presets.java:2317 build/trans_presets.java:2322
+#: 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:2351 build/trans_presets.java:2357
+#: 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:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2486
-#: build/trans_presets.java:2493 build/trans_presets.java:2507
-#: build/trans_presets.java:2513 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2561
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2391 build/trans_presets.java:2398
+#: build/trans_presets.java:2492 build/trans_presets.java:2499
+#: build/trans_presets.java:2513 build/trans_presets.java:2519
+#: build/trans_presets.java:2526 build/trans_presets.java:2533
+#: build/trans_presets.java:2539 build/trans_presets.java:2545
+#: build/trans_presets.java:2567 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2587
 #: build/trans_presets.java:2594 build/trans_presets.java:2600
 #: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2625
-#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2618 build/trans_presets.java:2624
+#: build/trans_presets.java:2631 build/trans_presets.java:2638
 #: build/trans_presets.java:2645 build/trans_presets.java:2651
 #: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2669 build/trans_presets.java:2675
+#: build/trans_presets.java:2682 build/trans_presets.java:2689
 #: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2712 build/trans_presets.java:2721
-#: build/trans_presets.java:2736 build/trans_presets.java:2742
-#: build/trans_presets.java:2750 build/trans_presets.java:2757
-#: build/trans_presets.java:2777 build/trans_presets.java:2788
+#: build/trans_presets.java:2708 build/trans_presets.java:2718
+#: build/trans_presets.java:2727 build/trans_presets.java:2742
+#: build/trans_presets.java:2748 build/trans_presets.java:2756
+#: build/trans_presets.java:2763 build/trans_presets.java:2783
 #: build/trans_presets.java:2794 build/trans_presets.java:2800
 #: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2819 build/trans_presets.java:2826
-#: build/trans_presets.java:2833 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2853
-#: build/trans_presets.java:2860 build/trans_presets.java:2867
-#: build/trans_presets.java:2874 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2903 build/trans_presets.java:2909
+#: build/trans_presets.java:2818 build/trans_presets.java:2825
+#: build/trans_presets.java:2832 build/trans_presets.java:2839
+#: build/trans_presets.java:2845 build/trans_presets.java:2851
+#: build/trans_presets.java:2859 build/trans_presets.java:2866
+#: build/trans_presets.java:2873 build/trans_presets.java:2880
+#: build/trans_presets.java:2886 build/trans_presets.java:2893
+#: build/trans_presets.java:2900 build/trans_presets.java:2909
 #: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2936
-#: build/trans_presets.java:2946 build/trans_presets.java:2955
+#: build/trans_presets.java:2927 build/trans_presets.java:2933
+#: build/trans_presets.java:2942 build/trans_presets.java:2952
 #: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2972 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2993
+#: build/trans_presets.java:2973 build/trans_presets.java:2978
+#: build/trans_presets.java:2984 build/trans_presets.java:2990
 #: build/trans_presets.java:2999 build/trans_presets.java:3005
 #: build/trans_presets.java:3011 build/trans_presets.java:3017
 #: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3036 build/trans_presets.java:3042
-#: build/trans_presets.java:3047 build/trans_presets.java:3054
-#: build/trans_presets.java:3061 build/trans_presets.java:3067
-#: build/trans_presets.java:3076 build/trans_presets.java:3084
+#: build/trans_presets.java:3035 build/trans_presets.java:3042
+#: build/trans_presets.java:3048 build/trans_presets.java:3053
+#: build/trans_presets.java:3060 build/trans_presets.java:3067
+#: build/trans_presets.java:3073 build/trans_presets.java:3082
 #: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3103 build/trans_presets.java:3109
-#: build/trans_presets.java:3116 build/trans_presets.java:3122
+#: build/trans_presets.java:3102 build/trans_presets.java:3109
+#: build/trans_presets.java:3115 build/trans_presets.java:3122
 #: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3153
-#: build/trans_presets.java:3167 build/trans_presets.java:3181
+#: build/trans_presets.java:3140 build/trans_presets.java:3146
+#: build/trans_presets.java:3159 build/trans_presets.java:3173
+#: build/trans_presets.java:3187
 msgid "Name"
 msgstr "名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <space />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. 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:405
+#: build/trans_presets.java:361 build/trans_presets.java:660
+#: build/trans_presets.java:800 build/trans_presets.java:1148
+#: build/trans_presets.java:1406 build/trans_presets.java:2348
+#: build/trans_presets.java:2390 build/trans_presets.java:2416
+#: build/trans_presets.java:2943 build/trans_presets.java:2953
+#: build/trans_presets.java:2962
+msgid "Type"
+msgstr "類型"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:413
+#, fuzzy
+msgid "Near"
+msgstr "靠近"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:122
+msgid ""
+"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
+"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
+"Hold left mousebutton and draw a frame."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:125
+msgid "Slippy map"
+msgstr "快速地圖"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:40
+msgid "zoom level"
+msgstr "縮放等級"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:41
+msgid "x from"
+msgstr "x 軸"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:48
+msgid "to"
+msgstr "到"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:46
+msgid "y from"
+msgstr "y 軸"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:86
+msgid "Tile Numbers"
+msgstr "拼貼數"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:115
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:164
+msgid "JOSM Help Browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:187
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:209
+#, 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 ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:311
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check your<br>your internet connection</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:316
+msgid "Failed to open URL"
+msgstr ""
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:349
+msgid "Open the current help page in an external browser"
+msgstr ""
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:361
+msgid "Edit the current help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:368
+#, 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 ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:391
+msgid "Reload the current help page"
+msgstr ""
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
+msgid "Go to the previous page"
+msgstr ""
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:426
+msgid "Go to the next page"
+msgstr ""
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:442
+msgid "Go to the JOSM help home page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:473
+msgid "Warning: bad location in HTML document. Exception was: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:523
+msgid "Failed to open help page. The target URL is empty."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:524
+msgid "Failed to open help page"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java:73
+msgid "Failed to read command. Exiting help browser. Exception was:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:90
+msgid "Failed to launch the external help browser"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
+msgid "Latitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
+msgid "Longitude: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:135
+msgid "Coordinates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, java-format
+msgid "History for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:47
+#, java-format
+msgid "History for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:119
+msgid "Close the dialog"
+msgstr "關閉這個對話盒"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:132
+msgid "Reload the history from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:183
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:188
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:202
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:207
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+msgid "Load history"
+msgstr "載入歷史紀錄"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, java-format
+msgid "Object id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:172
+#, java-format
+msgid "Loading history for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:173
+#, java-format
+msgid "Loading history for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:174
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "節點 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
 msgid "User"
 msgstr "使用者"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:47
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:49
 msgid "Changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:73
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:75
 #, java-format
 msgid ""
@@ -7051,4 +7286,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:932
 msgid "Launch a file chooser to select a file"
 msgstr ""
@@ -7340,9 +7576,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
-#, java-format
-msgid "{0} object to modifiy:"
+#, fuzzy, java-format
+msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "要編輯的物件："
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:289
@@ -7438,5 +7673,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:106
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:91
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:105
 msgid "Preparing primitives to upload ..."
 msgstr ""
@@ -7466,110 +7710,110 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:281
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 #, java-format
 msgid "Images for {0}"
 msgstr "{0} 的圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:288
 msgid "Read GPX..."
 msgstr "讀取 GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:307
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "點 {0} x {1} 沒有時刻"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:312
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:314
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "不能讀取點 {1} x {2} 的時刻「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:325
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:146
+#, java-format
+msgid "Reading {0}..."
+msgstr "正在讀取 {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:357
 msgid "No images with readable timestamps found."
 msgstr "找不到具可讀時刻戳記的圖片。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:335
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
-#, java-format
-msgid "Reading {0}..."
-msgstr "正在讀取 {0}..."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:406
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:275
 msgid "Geotagged Images"
 msgstr "有 Geotag 的圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:601
 #, java-format
 msgid "GPS start: {0}"
 msgstr "GPS 開始：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:602
 #, java-format
 msgid "GPS end: {0}"
 msgstr "GPS 結束：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:594
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:604
 #, java-format
 msgid "current delta: {0}s"
 msgstr "目前的差分： {0}秒"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:595
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:605
 msgid "timezone difference: "
 msgstr "時區差異： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:313
 msgid "image"
 msgid_plural "images"
 msgstr[0] "圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:621
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:631
 #, java-format
 msgid "{0} within the track."
 msgstr "{0} 在此軌跡中。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:680
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:690
 msgid "Sync clock"
 msgstr "同步時鐘"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:691
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:297
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG 圖片 (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:738
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:748
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "檔案「{0}」的日期無法解析。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:747
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:757
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "在檔案「{0}」中沒有 EXIF 時刻。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:754
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:764
 msgid "Image"
 msgstr "圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:766
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "輸入要顯示的日期 (mm/dd/yyyy HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:759
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:769
 msgid "GPS unit timezone (difference to photo)"
 msgstr "GPS 單元時區 (不同於照片)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:771
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:781
 msgid "Synchronize Time with GPS Unit"
 msgstr "與 GPS 單元同步時刻"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:794
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:804
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:811
 msgid "Time entered could not be parsed."
 msgstr "輸入的時刻無法解析。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
@@ -7577,30 +7821,30 @@
 msgstr "gps 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Customize line drawing"
 msgstr "自訂線條的繪製"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Use global settings."
 msgstr "使用全域設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Draw lines between points for this layer."
 msgstr "在這個圖層的各點之間繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:129
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Do not draw lines between points for this layer."
 msgstr "在這個圖層的各點之間不要繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:143
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
 msgid "Select line drawing options"
 msgstr "選擇線條繪製選項"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7608,5 +7852,5 @@
 msgstr "自訂顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:165
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7615,5 +7859,5 @@
 msgstr "預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7622,43 +7866,43 @@
 msgstr "選擇一種顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:189
 msgid "Markers From Named Points"
 msgstr "已命名點的標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} 的已命名軌跡點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:212
 msgid "Import Audio"
 msgstr "匯入音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:228
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave 音效檔案 (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:264
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} 的音效標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:281
 msgid "Import images"
 msgstr "匯入圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:170
 #, java-format
 msgid "Name: {0}"
 msgstr "名稱：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:345
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:418
 #, java-format
 msgid "Description: {0}"
 msgstr "描述：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #, java-format
 msgid "{0} track"
@@ -7668,28 +7912,28 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3190
 msgid "Description"
 msgstr "描述"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:353
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 msgid "Length: "
 msgstr "長度： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:407
 #, java-format
 msgid "{0} route, "
@@ -7697,5 +7941,5 @@
 msgstr[0] "{0} 路線， "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:408
 #, java-format
 msgid "{0} waypoint"
@@ -7703,10 +7947,10 @@
 msgstr[0] "{0} 航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:754
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
 msgid "Convert to data layer"
 msgstr "轉換為資料圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:762
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7716,11 +7960,11 @@
 "軌跡，請看這裡："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:764
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:627
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
@@ -7730,29 +7974,29 @@
 msgstr "轉換自：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:809
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:835
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:933
 msgid "Download from OSM along this track"
 msgstr "從 OSM 沿這條軌跡下載"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:817
 msgid "Download everything within:"
 msgstr "下載這裡面的每個物件："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 #, java-format
 msgid "{0} meters"
 msgstr "{0} 公尺"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
 msgid "Maximum area per request:"
 msgstr "每個要求最大區域："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:827
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方公里"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:926
 #, java-format
 msgid ""
@@ -7762,13 +8006,9 @@
 "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
-msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
 msgid "No GPX track available in layer to associate audio with."
 msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1206
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7776,5 +8016,5 @@
 msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1213
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7782,23 +8022,23 @@
 msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:113
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:109
 #, java-format
 msgid "Data Layer {0}"
 msgstr "資料圖層 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:177
 msgid "outside downloaded area"
 msgstr "超出下載的區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
 #, java-format
 msgid "version {0}"
 msgstr "版本 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:296
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:297
 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:330
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:331
 #, java-format
 msgid "There was {0} conflict detected."
@@ -7807,39 +8047,52 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
-#, java-format
-msgid ""
-"{0} object has been purged from the local dataset because it is deleted on "
-"the server."
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:337
+#, 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} objects have been purged from the local dataset because they are deleted "
-"on the server."
+"{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] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:346
-msgid "Please consult the Conflict List Dialog<br>and manually resolve them."
-msgstr ""
-
+#, 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] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
+msgid "Click to close this dialog and continue editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#, fuzzy, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] " ({0} 已刪除。)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} 組成："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
-#, java-format
-msgid " ({0} deleted.)"
-msgstr " ({0} 已刪除。)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "取消設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "API 版本： {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:624
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
@@ -7996,6 +8249,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
@@ -8010,6 +8261,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
@@ -8179,5 +8428,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:412
 #: ../plugins/terracer/src/terracer/TerracerAction.java:430
@@ -8504,20 +8753,19 @@
 msgstr "語言"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:34
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:41
 msgid "Enable built-in defaults"
 msgstr "啟用內建預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:36
+#: ../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:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
+#: ../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/MapPaintPreference.java:62
-msgid "Used style"
 msgstr ""
 
@@ -8532,6 +8780,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
 msgid "Update"
 msgstr "更新"
@@ -8682,68 +8929,103 @@
 msgstr "捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:157
+msgid "Active styles"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:167
+#, java-format
+msgid "Available styles (from {0})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:173
+msgid "Icon paths"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "Short Description: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
 #, java-format
 msgid "URL: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:412
 #, java-format
 msgid "Author: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
 msgid "Webpage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:421
 #, java-format
 msgid "Version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
-msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
-msgid "Copy defaults"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
-msgid "Please select the row to copy."
-msgstr "請選擇要複製的列。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
-#, java-format
-msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
-msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
-msgid "Delete the selected source from the list."
-msgstr "從清單刪除選取的來源。"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
-msgid "Defaults (See tooltip for detailed information)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:435
+msgid "Add a filename or an URL of an active style"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:450
+#, fuzzy
+msgid "Remove the selected styles from the list of active styles"
+msgstr "從合併元件的清單移除選取的項目"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:471
+#, fuzzy
+msgid "Edit the filename or URL for the selected active style"
+msgstr "編輯所有物件選取設定鍵的數值"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:493
+#, fuzzy
+msgid "Add the selected available styles to the list of active styles"
+msgstr "從合併元件的清單移除選取的項目"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:516
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:627
+#, fuzzy
+msgid "Add a new icon path"
+msgstr "加入新的圖層"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:640
+#, fuzzy
+msgid "Remove the selected icon paths"
+msgstr "重新整理選擇區域清單。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:661
+#, fuzzy
+msgid "Edit the selected icon path"
+msgstr "編輯選取的來源。"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:706
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:728
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:768
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:800
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:39
 msgid "Sort presets menu"
 msgstr "排序預設組合選單"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:51
 msgid "Tagging Presets"
@@ -8931,5 +9213,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:261
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:271
 msgid "More information about this feature"
 msgstr "更多關於這個功能的資訊"
@@ -8993,16 +9275,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {1} / {0}"
-msgstr "預設組合群組「{0}」"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
-#, fuzzy, java-format
+#, java-format
 msgid "Preset group {0}"
-msgstr "預設組合群組「{0}」"
-
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:175
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:97
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:174
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
 #: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
@@ -9010,5 +9292,5 @@
 msgstr "正在連接 OSM 伺服器..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:48
 #, java-format
 msgid "Downloading points {0} to {1}..."
@@ -9117,5 +9399,5 @@
 msgstr "分析檔案「{0}」失敗"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:313
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:331
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "分析錯誤：gpx 文件有無效的文件結構"
@@ -9341,5 +9623,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:179
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -9366,5 +9648,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:175
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -9372,5 +9654,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:182
 #, java-format
 msgid "Unsupported version: {0}"
@@ -9383,5 +9665,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -9392,50 +9674,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Incorrect password or username."
 msgstr "不正確的密碼或使用者名稱。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告：密碼是以未加密的方式傳輸。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
 msgid "Save user and password (unencrypted)"
 msgstr "儲存使用者與密碼(未加密)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 msgid "Login"
 msgstr "登入"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSM 伺服器 (REST API) 的基礎 URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid "Login name (e-mail) to the OSM account."
 msgstr "OSM 帳號的登入名稱 (e-mail)。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSM 帳號的登入密碼。留空則不會儲存任何密碼。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
 msgid "Base Server URL"
 msgstr "基礎伺服器 URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
 msgid "OSM username (e-mail)"
 msgstr "OSM 使用者名稱 (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
 msgid "OSM password"
 msgstr "OSM 密碼"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9534,5 +9816,5 @@
 msgstr "檔案「{0}」不存在"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
 #, java-format
 msgid ""
@@ -9541,38 +9823,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:229
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:257
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:263
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:268
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:275
 #, java-format
 msgid ""
@@ -9580,19 +9862,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:282
 msgid "Incomplete <member> specification with ref=0"
 msgstr "不完整的 <member>> 規格，ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:294
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
 msgid "Illegal object with ID=0."
 msgstr "不合法的物件，id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:348
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
 #, java-format
 msgid ""
@@ -9601,7 +9883,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
+#. default version in 0.5 files for existing primitives
+#. default version in 0.5 files for new primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:376
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:380
 #, java-format
 msgid ""
@@ -9611,25 +9897,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:373
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:398
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:403
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:427
 #, java-format
 msgid ""
@@ -9637,5 +9923,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
 #, java-format
 msgid ""
@@ -9644,5 +9930,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:488
 #, java-format
 msgid ""
@@ -9650,5 +9936,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
 #, java-format
 msgid ""
@@ -9657,13 +9943,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:549
 msgid "Prepare OSM data..."
 msgstr "準備 OSM 資料..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:550
 msgid "Parsing OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:555
 msgid "Preparing data set..."
 msgstr ""
@@ -9674,14 +9960,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:137
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
 msgid "Downloading from OSM Server..."
-msgstr "從 OSM 下載"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
 msgid "Downloading referring ways ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:182
 msgid "Downloading referring relations ..."
 msgstr ""
@@ -9792,15 +10077,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
 msgid "Update Plugins"
 msgstr "更新外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:158
 msgid "Download Plugins"
 msgstr "下載外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
 #, java-format
 msgid ""
@@ -9813,28 +10098,32 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
-#, java-format
-msgid "{0} Plugin successfully downloaded. Please restart JOSM."
-msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#, fuzzy, java-format
+msgid "{0} Plugin successfully downloaded."
+msgid_plural "{0} Plugins successfully downloaded."
 msgstr[0] "已成功下載 {0} 個外掛程式。請重新啟動 JOSM。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:64
+msgid "Please restart JOSM."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:82
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "正在下載外掛程式 {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:133
 msgid "Skip download"
 msgstr "略過下載"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Download Plugin"
 msgstr "下載外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:134
 msgid "Skip Download"
 msgstr "略過下載"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:129
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:136
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
@@ -9846,10 +10135,10 @@
 msgstr "外掛程式 {0} 發生錯誤"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:75
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:74
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:83
 #, java-format
 msgid ""
@@ -9859,49 +10148,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:106
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:101
+msgid ""
+"You updated your JOSM software.\n"
+"To prevent problems the plugins should be updated as well.\n"
+"Update plugins now?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:114
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "上次的外掛程式更新已是 {0} 天前。"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:122
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+#, fuzzy
+msgid "Update plugins"
+msgstr "更新外掛程式"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
+msgid "Skip update"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "外掛程式 {0} 要求 JOSM 更新到 {1} 版。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:166
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "外掛程式 {1} 要求 外掛程式 {0} 但是找不到。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:181
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "找不到外掛程式：{0}。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:157
-#, java-format
-msgid "Last plugin update more than {0} days ago."
-msgstr "上次的外掛程式更新已是 {0} 天前。"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:159
-msgid ""
-"(You can change the number of days after which this warning appears<br>by "
-"setting the config option 'pluginmanager.warntime'.)"
-msgstr ""
-"(您可以設定這個警告每隔幾天出現，<br>只要設定選項「pluginmanager."
-"warntime」。)"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:211
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "無法載入外掛程式 {0}。是否從偏好設定中刪除？"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:199
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:309
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:310
 msgid "Disable plugin"
 msgstr "停用外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Keep plugin"
 msgstr "保留外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:267
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -9909,9 +10207,9 @@
 msgstr "啓用更新的外掛程式失敗。請檢查 JOSM 是否有覆蓋既存項目的權限。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:293
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
 msgid "<html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:294
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:315
 #, java-format
 msgid ""
@@ -9919,19 +10217,19 @@
 msgstr "發生未預期的例外，可能來自「{0}」外掛程式。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:297
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "根據此外掛程式的資訊，作者是 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:321
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
 msgstr "在回報程式錯誤前請先嘗試將外掛程式升級到最新版本。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:302
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:323
 msgid "Should the plugin be disabled?"
 msgstr "是否停用此外掛程式？"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:314
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -9939,22 +10237,22 @@
 msgstr "該外掛程式已從組態中移除。請重新啟動 JOSM 以卸載外掛程式。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:320
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:341
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:364
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:385
 msgid "Plugin information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:370
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:391
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
 msgid "no description available"
 msgstr "沒有描述可用"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
 msgid "More details"
 msgstr "更多詳細資料"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9962,18 +10260,18 @@
 msgstr[0] "從 {0} 網站下載的外掛程式資訊"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
 msgid "No plugin information found."
 msgstr "找不到外掛程式資訊。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:97
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:109
 msgid "All installed plugins are up to date."
 msgstr "所有已安裝的外掛程式都是最新版。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:119
 #, java-format
 msgid ""
@@ -9986,9 +10284,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:157
 msgid "Download missing plugins"
 msgstr "下載缺少的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:160
 #, java-format
 msgid ""
@@ -10003,9 +10301,9 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:181
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:228
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:51
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:178
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: build/trans_presets.java:335 build/trans_presets.java:336
@@ -10027,19 +10325,19 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
+#: build/trans_presets.java:1413 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
 msgid "unknown"
 msgstr "不明"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}：版本 {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:253
 msgid "Plugin bundled with JOSM"
 msgstr "JOSM 隨附外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:411
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -10101,5 +10399,5 @@
 msgstr "（該文字已複製到您的剪貼簿中。）"
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:40
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:38
 #, java-format
 msgid ""
@@ -10108,5 +10406,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:55
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:53
 #, java-format
 msgid ""
@@ -10115,5 +10413,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:72
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:70
 #, java-format
 msgid ""
@@ -10123,5 +10421,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:99
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:97
 #, java-format
 msgid ""
@@ -10131,10 +10429,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:125
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
 msgid "Failed to parse date ''{0}'' replied by server."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:130
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:128
 #, java-format
 msgid ""
@@ -10143,5 +10441,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:136
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:134
 #, java-format
 msgid ""
@@ -10150,16 +10448,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:145
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:143
 #, java-format
 msgid ""
 "<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+"(untranslated):<br>{0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:149
 msgid "<html>The server reported that it has detected a conflict.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:188
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #, java-format
 msgid ""
@@ -10169,5 +10467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:201
 #, java-format
 msgid ""
@@ -10176,5 +10474,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:221
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
 msgid ""
@@ -10183,5 +10481,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:237
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:234
 #, java-format
 msgid ""
@@ -10190,10 +10488,10 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:251
-#, java-format
-msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -10202,10 +10500,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:257
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:254
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:271
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:268
 #, java-format
 msgid ""
@@ -10216,5 +10514,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:298
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:295
 #, java-format
 msgid ""
@@ -10224,5 +10522,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:369
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
 #, java-format
 msgid ""
@@ -10233,5 +10531,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/I18n.java:151
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:159
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
@@ -10333,11 +10631,4 @@
 "Preference with key ''{0}'' does not exist. Can''t restore window geometry "
 "from preferences."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
-#, java-format
-msgid ""
-"Warning: Failed to restore window geometry from key ''{0}''. Falling back to "
-"default geometry. Details: {1}"
 msgstr ""
 
@@ -10480,5 +10771,6 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
-#: build/trans_presets.java:2290
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:828
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -10494,10 +10786,10 @@
 #. 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:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "奇數"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 #: ../plugins/terracer/src/terracer/TerracerAction.java:413
 #: ../plugins/terracer/src/terracer/TerracerAction.java:437
@@ -10505,103 +10797,103 @@
 msgstr "偶數"
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:91
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:98
 msgid "Alphabetic"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:161
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:171
 #, java-format
 msgid "Relation: {0}"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:173
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:183
 msgid "Associate with street using:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:184
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:194
 msgid "Numbering Scheme:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:187
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:197
 msgid "Starting #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:188
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:198
 msgid "Ending #:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:255
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:265
 #, java-format
 msgid "Will associate {0} additional house number nodes"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:381
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:391
 msgid "City:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:382
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:392
 msgid "State:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:383
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:393
 msgid "Post Code:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:384
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:394
 msgid "Country:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:385
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:395
 msgid "Full Address:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:420
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:430
 msgid "Optional Information:"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:600
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:610
 msgid "Please select a street to associate with address interpolation way"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:613
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:623
 msgid "Please select address interpolation way for this street"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:719
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:729
 msgid "Expected odd numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:724
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:734
 msgid "Expected even numbers for addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:740
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:750
 msgid "Country code must be 2 letters"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:878
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:891
 msgid "Please enter valid number for starting and ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:896
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:909
 msgid "Alphabetic address must end with a letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:911
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:924
 msgid "Starting and ending numbers must be the same for alphabetic addresses"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:917
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:930
 msgid "Starting address letter must be less than ending address letter"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:933
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:946
 msgid "Please enter valid number for starting address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:936
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:949
 msgid "Please enter valid number for ending address"
 msgstr ""
 
-#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:943
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:956
 msgid "Starting address number must be less than ending address number"
 msgstr ""
@@ -10655,46 +10947,47 @@
 "{0} 公里/小時"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:107
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
 msgid "Extracting GPS locations from EXIF"
 msgstr "從 EXIF 中解出 GPS 位置"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:113
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:120
 msgid "Starting directory scan"
 msgstr "開始掃描目錄"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:118
-msgid "One of the selected files was null !!!"
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#, fuzzy
+msgid "One of the selected files was null"
 msgstr "選取的檔案其中之一是空的！！！"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:134
 msgid "Read photos..."
 msgstr "讀取相片..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:185
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "無法取得目錄  {0} 的路徑\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:197
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "正在掃描目錄 {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:203
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "在目錄 {0} 找到空的檔案\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:201
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:206
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "從目錄 {0} 取得檔案時發生錯誤\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:266
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:295
 msgid "Correlate to GPX"
 msgstr "關聯到 GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -10954,5 +11247,5 @@
 msgstr "檔案 {0} 有錯誤"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:92
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
 #, java-format
 msgid ""
@@ -10965,10 +11258,10 @@
 #. 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:97
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:96
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:137
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:136
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:421
 msgid "Error loading file"
@@ -11016,13 +11309,13 @@
 msgstr "選擇自..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:136
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:145
 msgid "Auto sourcing"
 msgstr "自動來源"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:200
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -11034,13 +11327,13 @@
 "您是否想要回復以 F11 作為抓取動作？"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
 msgid "Restore grab shortcut F11"
 msgstr "回復抓取捷徑鍵 F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM 已停止以便讓變更生效。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:273
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:274
 #, java-format
 msgid ""
@@ -11148,7 +11441,6 @@
 #. the crosspiece display
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
-#, fuzzy
 msgid "Display crosspieces:"
-msgstr "顯示坐標為"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
@@ -11166,5 +11458,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:26
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:22
 #, java-format
@@ -11207,13 +11499,13 @@
 msgstr "建立邊界"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:31
 msgid "Contacting cadastre WMS ..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:37
 msgid "Image already loaded"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:73
 msgid ""
 "Municipality vectorized !\n"
@@ -11344,22 +11636,22 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Change location"
 msgstr "改變位置"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:27
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
 msgstr "為下個要求設定新的位置"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:45
 msgid "Add a new layer"
 msgstr "加入新的圖層"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:48
-#: build/trans_presets.java:2343
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:47
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "位置"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:49
 msgid ""
 "<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
@@ -11369,5 +11661,5 @@
 "點。</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:64
 msgid "Add new layer"
 msgstr "加入新的圖層"
@@ -11381,9 +11673,9 @@
 msgstr "取得新的 cookie（作業階段逾時）"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:36
 msgid "PNG files (*.png)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:44
 msgid "Export as PNG format (only raster images)"
 msgstr ""
@@ -11402,9 +11694,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:34
-#, fuzzy
 msgid "Adjust the position of the WMS layer (raster images only)"
-msgstr "調整選取的 WMS 圖層的位置"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:48
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:61
 msgid ""
 "This mode works only if active layer is\n"
@@ -11428,5 +11719,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:78
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Blank Layer"
 msgstr "空白圖層"
@@ -11455,5 +11746,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:392
 #, java-format
 msgid ""
@@ -11464,18 +11755,18 @@
 "建立一個新的。"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:386
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
 msgid "Cache Format Error"
 msgstr "快取格式錯誤"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:415
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr "快取中的蘭勃特區 {0} 與目前的蘭勃特區 {1} 不相容"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
 msgid "Cache Lambert Zone Error"
 msgstr "快取蘭勃特區發生錯誤"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:535
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:550
 #, java-format
 msgid ""
@@ -11572,5 +11863,5 @@
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:106
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
 msgid "No data loaded."
 msgstr "沒有載入資料。"
@@ -11978,7 +12269,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2342 build/trans_style.java:990
+#: build/trans_presets.java:2348 build/trans_style.java:990
 #: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3400 build/trans_style.java:3408
+#: build/trans_style.java:3408 build/trans_style.java:3416
 msgid "water"
 msgstr "水域"
@@ -12183,32 +12474,32 @@
 msgstr "LiveGPS 圖層"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Capture GPS Track"
 msgstr "擷取 GPS 軌跡"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "連線至 gpsd 伺服器並在 LiveGPS 圖層中顯示目前的位置。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Center Once"
 msgstr "置中一次"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
 msgid "Center the LiveGPS layer to current position."
 msgstr "將 LiveGPS 圖層置中於目前的位置。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Auto-Center"
 msgstr "自動置中"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "持續將 LiveGPS 圖層置中到目前的位置。"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:100
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -12297,24 +12588,24 @@
 
 #. Commit
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:37
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:130
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:36
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 msgid "Create multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:74
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:92
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
 msgid "Multipolygon must consist only of closed ways."
 msgstr ""
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:111
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
 msgid "You must select at least two ways."
 msgstr ""
@@ -12464,4 +12755,9 @@
 msgstr "Firefox 可執行檔"
 
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#, fuzzy
+msgid "PicLayer"
+msgstr "層級"
+
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
@@ -12509,30 +12805,30 @@
 msgstr "准許的動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../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:124
+#: ../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:124
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:227
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:229
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:242
 msgid "Do you want to allow this?"
 msgstr "您是否要允許這個？"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:241
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:230
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:243
 msgid "Confirm Remote Control action"
 msgstr "確認遠端控制動作"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:228
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:240
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "遠端控制被要求自下列 URL 匯入資料："
@@ -12551,7 +12847,5 @@
 msgstr "尚未選取關係"
 
-#. Add menu
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:139
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
@@ -12560,4 +12854,5 @@
 #: ../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 "路線規畫"
@@ -12579,25 +12874,25 @@
 msgstr "開啟路線規畫節點的清單"
 
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+#: ../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:88
+#: ../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:90
+#: ../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:113
+#: ../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:139
+#: ../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:152
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
 msgid "Clear route"
 msgstr "清除路線"
@@ -12627,93 +12922,87 @@
 msgstr "輸入重量限制值"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:74
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
 msgid "Slippy Map"
 msgstr "快速地圖"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:80
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:146
+#, fuzzy
+msgid "Auto Zoom"
+msgstr "自動縮放： "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:155
 msgid "Load Tile"
 msgstr "載入拼貼"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:91
-msgid "Show Tile Status"
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:165
+#, fuzzy
+msgid "Show Tile Info"
 msgstr "載入拼貼狀態"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:102
-msgid "Request Update"
-msgstr "要求更新"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:187
 msgid "Load All Tiles"
 msgstr "載入所有拼貼"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:123
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:196
 msgid "Increase zoom"
 msgstr "增加縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:132
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:204
 msgid "Decrease zoom"
 msgstr "減少縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:140
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:212
+msgid "Snap to tile size"
+msgstr ""
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:224
 msgid "Flush Tile Cache"
 msgstr "清除拼貼快取"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:661
 msgid "image "
 msgstr "圖片 "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:34
 msgid "autozoom"
 msgstr "自動縮放"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:30
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:35
 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:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "SlippyMap"
 msgstr "快速地圖"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:45
 msgid "Settings for the SlippyMap plugin."
 msgstr "快速地圖外掛程式的設定值。"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:43
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
 msgid "Tile Sources"
 msgstr "拼貼來源"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:47
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
 msgid "Auto zoom: "
 msgstr "自動縮放： "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:51
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
 msgid "Autoload Tiles: "
 msgstr "自動載入拼貼： "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:55
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:63
+#, fuzzy
+msgid "Min zoom lvl: "
+msgstr "最大縮放等級： "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:67
 msgid "Max zoom lvl: "
 msgstr "最大縮放等級： "
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:59
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:71
 msgid "Fade background: "
 msgstr "淡化背景： "
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:146
-msgid "error loading metadata"
-msgstr "載入中繼資料時發生錯誤"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:154
-msgid "error requesting update: not zoom-level 12"
-msgstr "要求更新發生錯誤：不縮放-等級 12"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:164
-#, java-format
-msgid "requested: {0}"
-msgstr "要求的：{0}"
-
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:168
-msgid "error requesting update"
-msgstr "要求更新時發生錯誤"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
@@ -12726,5 +13015,5 @@
 msgstr "每分鐘把取得的資料儲存為檔案。"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
 #, java-format
@@ -12885,5 +13174,5 @@
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "街道名稱"
@@ -12930,29 +13219,29 @@
 msgstr "請選擇至少一個應該連結的封閉路徑。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:175
 msgid "No intersection found. Nothing was changed."
 msgstr "找不到交叉點。沒有東西變更。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:197
 msgid "Added node on all intersections"
 msgstr "在所有的交叉點加入節點"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:221
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "刪除不屬於內部多邊形一部分的路徑"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
 msgid "Fix relations"
 msgstr "修正關係"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined self-overlapping area"
 msgstr "已連結自我重疊的區域"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
 msgid "Joined overlapping areas"
 msgstr "已連結重疊的區域"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -12960,33 +13249,33 @@
 msgstr "部分屬於關係的一部分的路徑被修改了。請檢查是否造成錯誤。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Enter values for all conflicts."
 msgstr "輸入所有衝突項目的數值。"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:297
 msgid "Solve Conflicts"
 msgstr "解決衝突"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:312
 msgid "Fix tag conflicts"
 msgstr "修正標籤的衝突"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:462
 msgid "Removed Element from Relations"
 msgstr "從關係中移除元件"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:571
 msgid "Join Areas: Remove Short Ways"
 msgstr "連結區域：移除短路徑"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:586
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:587
 msgid "Closed Way"
 msgstr "封閉的路徑"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:854
 msgid "Remove tags from inner ways"
 msgstr "移除內部路徑的標籤"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:883
 msgid "Join Areas Function"
 msgstr "連結區域功能"
@@ -13192,8 +13481,4 @@
 msgstr "修正選取的錯誤。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
-msgid "Ignore"
-msgstr "忽略"
-
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:115
 msgid "Ignore the selected errors next time."
@@ -13238,25 +13523,24 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
 msgstr "海岸線。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
 msgstr "這會測試海岸線是否正確。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 #, fuzzy
-msgid "Unconnected coastline"
+msgid "Unconnceted coastline"
 msgstr "未排序的海岸線"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:88
-#, fuzzy
-msgid "Reversed coastline"
-msgstr "未排序的海岸線"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:97
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
 msgstr "未排序的海岸線"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
+msgid "Reversed coastline"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -13278,18 +13562,18 @@
 msgstr "路徑交叉"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:57
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:87
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:88
 msgid "Duplicated nodes"
 msgstr "重複的節點"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
 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:82
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:83
 msgid "Nodes at same position"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:145
 msgid "Confirmation"
 msgstr ""
@@ -13534,4 +13818,8 @@
 msgstr "編輯選取的來源。"
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
+msgid "Delete the selected source from the list."
+msgstr "從清單刪除選取的來源。"
+
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:693
 msgid "Data sources"
@@ -13746,7 +14034,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4159 build/trans_style.java:4166
-#: build/trans_style.java:4173 build/trans_style.java:4180
-#: build/trans_style.java:4187
+#: build/trans_style.java:4167 build/trans_style.java:4174
+#: build/trans_style.java:4181 build/trans_style.java:4188
+#: build/trans_style.java:4195
 msgid "building"
 msgstr "建築"
@@ -13760,5 +14048,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4194
+#: build/trans_style.java:4202
 msgid "area"
 msgstr "區域"
@@ -13768,25 +14056,25 @@
 msgstr "未封閉的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:46
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:60
 msgid "Unconnected ways."
 msgstr "未連接的路徑。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:47
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
 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:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126
 msgid "Way end node near other highway"
 msgstr "路徑結束點靠近其他的公路"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:111
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146
 msgid "Way end node near other way"
 msgstr "路徑結束點靠近其他的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:132
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167
 msgid "Way node near other way"
 msgstr "路徑節點靠近其他的路徑"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185
 msgid "Connected way end node near other way"
 msgstr "已連接的路徑結束點靠近其他的路徑"
@@ -13878,21 +14166,26 @@
 msgstr ""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:27
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#, fuzzy, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr "WMS 圖層 ({0})，於縮放 {1} 下載"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:28
 msgid "Walking Papers"
 msgstr ""
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:69
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:75
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:82
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:94
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:70
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:76
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:83
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:95
 msgid "Select a starting node on the end of a way"
 msgstr "在路徑的結尾選擇開始的節點"
 
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:150
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:170
 msgid "Reached the end of the line"
 msgstr "到達線條的結尾"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:157
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:177
 msgid "Reached a junction"
 msgstr "到達交會點"
@@ -14147,9 +14440,9 @@
 msgstr "檔案格式錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:171
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:172
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:184
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:185
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "開啓空白 WMS 圖層以便自檔案載入資料"
@@ -14615,6 +14908,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2394
-#: build/trans_presets.java:3182
+#: build/trans_presets.java:1571 build/trans_presets.java:2400
+#: build/trans_presets.java:3188
 msgid "Reference"
 msgstr "道路編號"
@@ -15176,5 +15469,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "metal"
 msgstr ""
@@ -15186,5 +15479,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2469
+#: build/trans_presets.java:1320 build/trans_presets.java:2475
 msgid "wood"
 msgstr ""
@@ -15472,7 +15765,7 @@
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
 #: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2432 build/trans_presets.java:2468
-#: build/trans_presets.java:2477 build/trans_presets.java:2478
-#: build/trans_presets.java:2479 build/trans_presets.java:2749
+#: build/trans_presets.java:2438 build/trans_presets.java:2474
+#: build/trans_presets.java:2483 build/trans_presets.java:2484
+#: build/trans_presets.java:2485 build/trans_presets.java:2755
 msgid "yes"
 msgstr "是"
@@ -15621,8 +15914,8 @@
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
 #: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
-#: build/trans_presets.java:2468 build/trans_presets.java:2477
-#: build/trans_presets.java:2478 build/trans_presets.java:2479
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:2474 build/trans_presets.java:2483
+#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:2755
 msgid "no"
 msgstr "否"
@@ -15749,31 +16042,4 @@
 msgstr "編輯交叉點"
 
-#. item "Highways/Streets/Roundabout" label "Edit Junction"
-#. <space />
-#. <key key="junction" value="roundabout" />
-#. item "Ways/Path" label "Edit Path"
-#. <space />
-#. <key key="highway" value="path" />
-#. <space />
-#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
-#. <key key="highway" value="crossing" />
-#. item "Water/Water/Wetland" text "Name"
-#. item "Car/Parking" text "Reference number"
-#. item "Man Made/Pipeline" text "Operator"
-#. 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"
-#: build/trans_presets.java:361 build/trans_presets.java:660
-#: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2342
-#: build/trans_presets.java:2384 build/trans_presets.java:2410
-#: build/trans_presets.java:2937 build/trans_presets.java:2947
-#: build/trans_presets.java:2956
-msgid "Type"
-msgstr "類型"
-
 #. item "Highways/Streets/Roundabout" combo "Type"
 #. color motorroad
@@ -15894,5 +16160,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3151
+#: build/trans_presets.java:361 build/trans_style.java:3159
 msgid "residential"
 msgstr "居住的"
@@ -15927,5 +16193,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4252
+#: build/trans_style.java:4260
 msgid "service"
 msgstr "巷/弄"
@@ -15960,5 +16226,5 @@
 #. color construction
 #: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3216 build/trans_style.java:3217
+#: build/trans_style.java:3224 build/trans_style.java:3225
 msgid "construction"
 msgstr "施工"
@@ -16348,12 +16614,12 @@
 #: build/trans_presets.java:1441 build/trans_presets.java:1448
 #: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2209 build/trans_presets.java:2311
-#: build/trans_presets.java:2341 build/trans_presets.java:2393
-#: build/trans_presets.java:2401 build/trans_presets.java:2418
-#: build/trans_presets.java:2430 build/trans_presets.java:2438
-#: build/trans_presets.java:2445 build/trans_presets.java:2499
-#: build/trans_presets.java:2547 build/trans_presets.java:2713
-#: build/trans_presets.java:2728 build/trans_presets.java:2767
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:2215 build/trans_presets.java:2317
+#: build/trans_presets.java:2347 build/trans_presets.java:2399
+#: build/trans_presets.java:2407 build/trans_presets.java:2424
+#: build/trans_presets.java:2436 build/trans_presets.java:2444
+#: build/trans_presets.java:2451 build/trans_presets.java:2505
+#: build/trans_presets.java:2553 build/trans_presets.java:2719
+#: build/trans_presets.java:2734 build/trans_presets.java:2773
+#: build/trans_presets.java:3193
 msgid "Operator"
 msgstr "經營者"
@@ -16566,6 +16832,6 @@
 #. item "Geography/Places/Volcano" text "Name"
 #: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2881
-#: build/trans_presets.java:2888 build/trans_presets.java:2895
+#: build/trans_presets.java:1760 build/trans_presets.java:2887
+#: build/trans_presets.java:2894 build/trans_presets.java:2901
 msgid "Elevation"
 msgstr "海拔"
@@ -16992,5 +17258,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3392
+#: build/trans_presets.java:1148 build/trans_style.java:3400
 msgid "marsh"
 msgstr ""
@@ -17523,25 +17789,25 @@
 #: 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:1930
-#: build/trans_presets.java:1936 build/trans_presets.java:2249
-#: build/trans_presets.java:2273 build/trans_presets.java:2500
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2506
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Opening Hours"
 msgstr ""
@@ -17607,24 +17873,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "24/7"
 msgstr ""
@@ -17637,24 +17903,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
@@ -17667,24 +17933,24 @@
 #: build/trans_presets.java:1714 build/trans_presets.java:1728
 #: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1930 build/trans_presets.java:1936
-#: build/trans_presets.java:2249 build/trans_presets.java:2273
-#: build/trans_presets.java:2508 build/trans_presets.java:2514
-#: build/trans_presets.java:2521 build/trans_presets.java:2528
-#: build/trans_presets.java:2534 build/trans_presets.java:2540
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2576 build/trans_presets.java:2582
-#: build/trans_presets.java:2589 build/trans_presets.java:2595
-#: build/trans_presets.java:2601 build/trans_presets.java:2607
-#: build/trans_presets.java:2613 build/trans_presets.java:2619
-#: build/trans_presets.java:2626 build/trans_presets.java:2633
-#: build/trans_presets.java:2640 build/trans_presets.java:2646
-#: build/trans_presets.java:2652 build/trans_presets.java:2658
-#: build/trans_presets.java:2664 build/trans_presets.java:2670
-#: build/trans_presets.java:2677 build/trans_presets.java:2684
-#: build/trans_presets.java:2691 build/trans_presets.java:2697
-#: build/trans_presets.java:2703 build/trans_presets.java:2714
-#: build/trans_presets.java:2722 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2751
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2514 build/trans_presets.java:2520
+#: build/trans_presets.java:2527 build/trans_presets.java:2534
+#: build/trans_presets.java:2540 build/trans_presets.java:2546
+#: build/trans_presets.java:2568 build/trans_presets.java:2575
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2652
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2683 build/trans_presets.java:2690
+#: build/trans_presets.java:2697 build/trans_presets.java:2703
+#: build/trans_presets.java:2709 build/trans_presets.java:2720
+#: build/trans_presets.java:2728 build/trans_presets.java:2743
+#: build/trans_presets.java:2749 build/trans_presets.java:2757
+#: build/trans_presets.java:2784
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17717,6 +17983,6 @@
 #. item "Shops/Vending machine" text "Operator"
 #: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2431
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:1787 build/trans_presets.java:2437
+#: build/trans_presets.java:2554
 msgid "Reference number"
 msgstr ""
@@ -17732,5 +17998,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2343
+#: build/trans_presets.java:1406 build/trans_presets.java:2349
 msgid "underground"
 msgstr "地下"
@@ -17744,5 +18010,5 @@
 #. item "Amenities/Toilets" text "Reference number"
 #: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2432
+#: build/trans_presets.java:1788 build/trans_presets.java:2438
 msgid "Fee"
 msgstr "費用"
@@ -17978,5 +18244,5 @@
 #. <separator/>
 #: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2483
 msgid "Shelter"
 msgstr ""
@@ -18444,5 +18710,5 @@
 #. item "Tourism/Guidepost" check "Hiking"
 #: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "自行車"
@@ -18457,5 +18723,5 @@
 #. item "Tourism/Guidepost" check "Mountainbiking"
 #: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "滑雪"
@@ -18609,16 +18875,29 @@
 
 #. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+#, fuzzy
+msgid "Palaeontological Site"
+msgstr "考古學地區"
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+#, fuzzy
+msgid "Edit Palaeontological Site"
+msgstr "編輯考古學地區"
+
+#. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "紀念建築"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "編輯紀念建築"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1847
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "紀念碑"
@@ -18626,55 +18905,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "編輯紀念碑"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1854
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "休閒"
 
 #. group "Leisure"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "水上樂園"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "編輯水上樂園"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "運動場"
@@ -18682,35 +18961,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "編輯運動場"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "釣魚"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "編輯釣魚場"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1888 build/trans_presets.java:2693
+#: build/trans_presets.java:1894 build/trans_presets.java:2699
 msgid "Sports"
 msgstr "運動用品"
 
 #. group "Sports"
-#: build/trans_presets.java:1889
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "運動設施"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "競技場"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "編輯競技揚"
@@ -18724,6 +19003,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1895 build/trans_presets.java:1904
-#: build/trans_presets.java:1913 build/trans_presets.java:1922
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "選擇運動："
@@ -19115,30 +19394,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
-#: build/trans_style.java:3620 build/trans_style.java:3628
-#: build/trans_style.java:3636 build/trans_style.java:3644
-#: build/trans_style.java:3652 build/trans_style.java:3660
-#: build/trans_style.java:3668 build/trans_style.java:3676
-#: build/trans_style.java:3684 build/trans_style.java:3692
-#: build/trans_style.java:3700 build/trans_style.java:3708
-#: build/trans_style.java:3716 build/trans_style.java:3724
-#: build/trans_style.java:3732 build/trans_style.java:3740
-#: build/trans_style.java:3748 build/trans_style.java:3756
-#: build/trans_style.java:3764 build/trans_style.java:3772
-#: build/trans_style.java:3780 build/trans_style.java:3788
-#: build/trans_style.java:3796 build/trans_style.java:3804
-#: build/trans_style.java:3812 build/trans_style.java:3820
-#: build/trans_style.java:3828 build/trans_style.java:3836
-#: build/trans_style.java:3844 build/trans_style.java:3852
-#: build/trans_style.java:3860 build/trans_style.java:3868
-#: build/trans_style.java:3876 build/trans_style.java:3884
-#: build/trans_style.java:3892 build/trans_style.java:3900
-#: build/trans_style.java:3908 build/trans_style.java:3916
-#: build/trans_style.java:3924 build/trans_style.java:3932
-#: build/trans_style.java:3940
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932 build/trans_style.java:3940
+#: build/trans_style.java:3948
 msgid "sport"
 msgstr "運動"
@@ -19148,227 +19427,280 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1897 build/trans_presets.java:1906
-#: build/trans_presets.java:1915 build/trans_presets.java:1924
+#: 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:1899
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "運動中心"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "編輯運動中心"
 
-#: build/trans_presets.java:1908
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1909
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "編輯跑道"
 
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "高爾夫路線"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1927
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "編輯高爾夫路線"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "迷你高爾夫"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "編輯迷你高爾夫"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "運動"
 
 #. group "Sport"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "多種"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1941
+#: 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"
@@ -19405,203 +19737,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1944 build/trans_presets.java:1950
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2037
-#: build/trans_presets.java:2044 build/trans_presets.java:2052
-#: build/trans_presets.java:2058 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
+#: 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:1946
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "田徑"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "編輯田徑"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "射箭"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "編輯射箭"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "編輯攀岩"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "獨木舟"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "編輯獨木舟"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "編輯自行車"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "賽狗"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "編輯賽狗"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "馬術"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "編輯馬術"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "賽馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "編輯賽馬"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "體操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "編輯體操"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "摩托車運動"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "編輯摩托車運動"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "溜冰"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "編輯溜冰"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "游泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "編輯游泳"
@@ -19609,56 +19941,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "編輯滑雪"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2035
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "困難度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "新手"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "容易"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "中級"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "進階"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "專家"
 
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "射擊"
@@ -19666,182 +19998,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "編輯射擊"
 
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "運動（球類）"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "足球"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "編輯足球"
 
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "美式足球"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "編輯美式足球"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "編輯澳洲足球"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "棒球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "編輯棒球"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "籃球"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "編輯籃球"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "高爾夫"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "編輯高爾夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "高爾夫路線"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "保齡球"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "編輯保齡球"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "木球"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "編輯木球"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "編曲棍球"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "回力球"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "編輯回力球"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "橄欖球"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "編輯橄欖球"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "編輯桌球"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "網球"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "編輯網路"
 
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "建築物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "建築物"
@@ -19849,5 +20181,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "公共建築"
@@ -19855,10 +20187,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "編輯公共建築"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "縣市政府/公所"
@@ -19866,10 +20198,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "編輯縣市政府/公所"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "大使館"
@@ -19877,10 +20209,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "編輯大使館"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "法院"
@@ -19889,10 +20221,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "編輯法院"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "監獄"
@@ -19901,10 +20233,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2185
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "編輯監獄"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "警察局"
@@ -19914,10 +20246,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "編輯警察局"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2197
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "消防隊"
@@ -19926,10 +20258,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "編輯消防隊"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2204
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "郵局"
@@ -19937,5 +20269,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "編輯郵局"
@@ -19943,15 +20275,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "編輯幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "學校"
@@ -19959,10 +20291,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "編輯學校"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "大學"
@@ -19970,10 +20302,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "編輯大學"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "學院"
@@ -19981,5 +20313,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "編輯學院"
@@ -19987,5 +20319,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "電影院"
@@ -19994,10 +20326,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "編輯電影院"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "圖書館"
@@ -20006,9 +20338,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2246
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "編輯圖書館"
 
-#: build/trans_presets.java:2251
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "美術館"
@@ -20016,10 +20348,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "編輯美術館"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "劇院"
@@ -20028,10 +20360,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "編輯劇院"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "宗教儀式場所"
@@ -20041,5 +20373,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2268
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "編輯宗教儀式場所"
@@ -20048,6 +20380,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "Religion"
 msgstr "宗教"
@@ -20056,66 +20388,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "bahai"
 msgstr "巴海大同教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "buddhist"
 msgstr "佛教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "christian"
 msgstr "基督教系"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "hindu"
 msgstr "印度教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jain"
 msgstr "耆那教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "jewish"
 msgstr "猶太教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "muslim"
 msgstr "回教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "sikh"
 msgstr "錫克教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2271 build/trans_presets.java:3068
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:2277 build/trans_presets.java:3074
+#: build/trans_presets.java:3083
 msgid "zoroastrian"
 msgstr "祆教"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "Denomination"
 msgstr "教派"
@@ -20124,81 +20456,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "anglican"
 msgstr "英國國教"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "baptist"
 msgstr "浸信會"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "catholic"
 msgstr "天主教"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "evangelical"
 msgstr "福音派教會"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "lutheran"
 msgstr "路德教派"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "methodist"
 msgstr "衛理公會教"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "mormon"
 msgstr "摩門教"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "orthodox"
 msgstr "東正教"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "pentecostal"
 msgstr "聖靈降臨教派"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "presbyterian"
 msgstr "長老派教會"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "protestant"
 msgstr "新教"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "quaker"
 msgstr "教友派"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "shia"
 msgstr "什葉派"
 
-#: build/trans_presets.java:2272 build/trans_presets.java:3069
-#: build/trans_presets.java:3078
+#: build/trans_presets.java:2278 build/trans_presets.java:3075
+#: build/trans_presets.java:3084
 msgid "sunni"
 msgstr "遜尼派"
 
 #. <separator/>
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr ""
@@ -20207,5 +20539,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2279
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr ""
@@ -20213,5 +20545,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr ""
@@ -20219,20 +20551,20 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2283
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2285
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "城市名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "郵遞區號"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "國碼"
@@ -20241,5 +20573,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -20247,61 +20579,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "編號規則"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "奇數"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "偶數"
 
-#: build/trans_presets.java:2295
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "按字母順序"
 
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "人造物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "作品"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "編輯作品"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "塔"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "編輯塔"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -20309,25 +20641,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "貯水塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "編輯貯水塔"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "貯氣桶"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "編輯貯氣桶"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "燈塔"
@@ -20335,10 +20667,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "編輯燈塔"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "風車"
@@ -20346,10 +20678,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "編輯風車"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "油管"
@@ -20358,37 +20690,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "編輯油管"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2342 build/trans_presets.java:2384
+#: build/trans_presets.java:2348 build/trans_presets.java:2390
 msgid "gas"
 msgstr "天然氣"
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "汙水處理廠"
@@ -20398,10 +20730,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "編輯汙水處理廠"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "起重機"
@@ -20409,10 +20741,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "編輯起重機"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -20420,10 +20752,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "測量點"
@@ -20431,10 +20763,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "編輯測量點"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "監視"
@@ -20442,5 +20774,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "編輯監視攝影機"
@@ -20448,5 +20780,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2384
 msgid "Power Generator"
 msgstr "發電廠"
@@ -20456,35 +20788,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2388
 msgid "Edit Power Generator"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "wind"
 msgstr "風力"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "hydro"
 msgstr "水力"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "fossil"
 msgstr "燃油"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "nuclear"
 msgstr "核能"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "coal"
 msgstr "燃媒"
 
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2390
 msgid "photovoltaic"
 msgstr "光電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2393
 msgid "Power Station"
 msgstr ""
@@ -20493,10 +20825,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2396
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2402
 msgid "Power Sub Station"
 msgstr ""
@@ -20505,5 +20837,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2399
+#: build/trans_presets.java:2405
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -20511,10 +20843,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2402 build/trans_presets.java:2419
+#: build/trans_presets.java:2408 build/trans_presets.java:2425
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2410
 msgid "Power Tower"
 msgstr "電塔"
@@ -20525,23 +20857,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2415
 msgid "Edit Power Tower"
 msgstr "編輯電塔"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2416
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2411
+#: build/trans_presets.java:2417
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2419
 msgid "Power Line"
 msgstr "電線"
@@ -20550,75 +20882,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2422
 msgid "Edit Power Line"
 msgstr "編輯電線"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2423
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2420
+#: build/trans_presets.java:2426
 msgid "Voltage"
 msgstr "電壓"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2421
+#: build/trans_presets.java:2427
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 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:2422
+#: build/trans_presets.java:2428
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2422
+#: build/trans_presets.java:2428
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2431
 msgid "Amenities"
 msgstr "便利設施"
 
 #. group "Amenities"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2432
 msgid "Toilets"
 msgstr "廁所"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2433 build/trans_presets.java:2549
+#: build/trans_presets.java:2439 build/trans_presets.java:2555
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2441
 msgid "Post Box"
 msgstr "郵筒"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2446
 msgid "Telephone"
 msgstr "電話"
@@ -20627,5 +20959,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2449
 msgid "Edit Telephone"
 msgstr "編輯電話"
@@ -20633,5 +20965,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2446 build/trans_presets.java:2550
+#: build/trans_presets.java:2452 build/trans_presets.java:2556
 msgid "Coins"
 msgstr "硬幣"
@@ -20639,5 +20971,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2447 build/trans_presets.java:2551
+#: build/trans_presets.java:2453 build/trans_presets.java:2557
 msgid "Notes"
 msgstr ""
@@ -20645,5 +20977,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2448 build/trans_presets.java:2552
+#: build/trans_presets.java:2454 build/trans_presets.java:2558
 msgid "Electronic purses and Charge cards"
 msgstr "電子錢包或收費卡"
@@ -20651,5 +20983,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2449 build/trans_presets.java:2553
+#: build/trans_presets.java:2455 build/trans_presets.java:2559
 msgid "Debit cards"
 msgstr ""
@@ -20657,15 +20989,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2450 build/trans_presets.java:2554
+#: build/trans_presets.java:2456 build/trans_presets.java:2560
 msgid "Credit cards"
 msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2457
 msgid "Telephone cards"
 msgstr "電話卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2459
 msgid "Recycling"
 msgstr "資源回收"
@@ -20674,5 +21006,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2462
 msgid "Edit Recycling station"
 msgstr "資源回收站"
@@ -20680,35 +21012,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2464
 msgid "Batteries"
 msgstr "電池"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2465
 msgid "Cans"
 msgstr "瓶罐"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2466
 msgid "Clothes"
 msgstr "衣服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2461
+#: build/trans_presets.java:2467
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2468
 msgid "Paper"
 msgstr "紙張"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2469
 msgid "Scrap Metal"
 msgstr "廢金屬"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2471
 msgid "Bench"
 msgstr "長椅"
@@ -20717,31 +21049,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2474
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2475
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "brown"
 msgstr ""
@@ -20812,40 +21144,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2470 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3135
-#: build/trans_style.java:3143 build/trans_style.java:3241
-#: build/trans_style.java:3249
+#: build/trans_presets.java:2476 build/trans_style.java:3071
+#: build/trans_style.java:3079 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3143
+#: build/trans_style.java:3151 build/trans_style.java:3249
+#: build/trans_style.java:3257
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2476
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2470
-#, fuzzy
+#: build/trans_presets.java:2476
 msgid "gray"
-msgstr "草地"
-
-#: build/trans_presets.java:2470
+msgstr ""
+
+#: build/trans_presets.java:2476
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2471
+#: build/trans_presets.java:2477
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2479
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2480
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -20854,30 +21185,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2476 build/trans_presets.java:2938
+#: build/trans_presets.java:2482 build/trans_presets.java:2944
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2482
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2484
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2485
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2487
 msgid "Fountain"
 msgstr "噴泉"
@@ -20886,10 +21217,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2490
 msgid "Edit Fountain"
 msgstr "編輯噴泉"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2494
 msgid "Drinking Water"
 msgstr "飲水機"
@@ -20898,10 +21229,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2497
 msgid "Edit Drinking Water"
 msgstr "編輯飲水機"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2501
 msgid "Baby Hatch"
 msgstr ""
@@ -20909,33 +21240,33 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2503
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2509
 msgid "Shops"
 msgstr "商店"
 
 #. group "Shops"
-#: build/trans_presets.java:2504
+#: build/trans_presets.java:2510
 msgid "Supermarket"
 msgstr "超級市場"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2511
 msgid "Edit Supermarket"
 msgstr "編輯超級市場"
 
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2516
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2517
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2522
 msgid "Convenience Store"
 msgstr "便利商店"
@@ -20943,9 +21274,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2518
+#: build/trans_presets.java:2524
 msgid "Edit Convenience Store"
 msgstr "編輯便利商店"
 
-#: build/trans_presets.java:2523
+#: build/trans_presets.java:2529
 msgid "Kiosk"
 msgstr ""
@@ -20953,27 +21284,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2531
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2536
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2537
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2542
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2543
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
 msgid "Vending machine"
 msgstr "自動販賣機"
@@ -20981,5 +21312,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2550
 msgid "Edit Vending machine"
 msgstr "編輯自動販賣機"
@@ -20987,88 +21318,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "Vending products"
 msgstr "販賣產品"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "food"
 msgstr "食物"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "sweets"
 msgstr "甜點"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "cigarettes"
 msgstr "菸"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "photos"
 msgstr "相片"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "animal_food"
 msgstr "飼料"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "news_papers"
 msgstr "報紙"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "toys"
 msgstr "玩具"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "stamps"
 msgstr "郵票"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "SIM-cards"
 msgstr "SIM-卡"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "condoms"
 msgstr "保險套"
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2552
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2561
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2563
 msgid "Butcher"
 msgstr "肉類"
@@ -21076,9 +21407,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2565
 msgid "Edit Butcher"
 msgstr "編輯肉店"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2570
 msgid "Baker"
 msgstr "麵包類"
@@ -21086,9 +21417,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2572
 msgid "Edit Baker"
 msgstr "編輯麵包店"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2577
 msgid "Florist"
 msgstr "花類"
@@ -21096,18 +21427,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2573
+#: build/trans_presets.java:2579
 msgid "Edit Florist"
 msgstr "編輯花店"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2584
 msgid "Organic"
 msgstr "有機產品"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2585
 msgid "Edit Organic Shop"
 msgstr "編輯有機產品商店"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2590
 msgid "Alcohol"
 msgstr "酒類"
@@ -21115,54 +21446,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2592
 msgid "Edit Alcohol Shop"
 msgstr "編輯賣酒的商店"
 
-#: build/trans_presets.java:2591
+#: build/trans_presets.java:2597
 msgid "Beverages"
 msgstr "飲料類"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2598
 msgid "Edit Beverages Shop"
 msgstr "編輯飲料店"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2603
 msgid "Computer"
 msgstr "電腦類"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2604
 msgid "Edit Computer Shop"
 msgstr "編輯電腦商店"
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2609
 msgid "Electronics"
 msgstr "電子材料"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2610
 msgid "Edit Electronics Shop"
 msgstr "編輯電子材料行"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2615
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2616
 msgid "Edit Hifi Shop"
 msgstr "編輯 Hifi 音響店"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2621
 msgid "Furniture"
 msgstr "傢俱類"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2622
 msgid "Edit Furniture Shop"
 msgstr "編輯傢俱店"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2627
 msgid "Garden Centre"
 msgstr "園藝中心"
@@ -21170,9 +21501,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2623
+#: build/trans_presets.java:2629
 msgid "Edit Garden Centre"
 msgstr "編輯園藝中心"
 
-#: build/trans_presets.java:2628
+#: build/trans_presets.java:2634
 msgid "Hardware"
 msgstr ""
@@ -21180,9 +21511,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2636
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2635
+#: build/trans_presets.java:2641
 msgid "Do-it-yourself-store"
 msgstr "DIY 商店"
@@ -21190,54 +21521,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2643
 msgid "Edit Do-it-yourself-store"
 msgstr "編輯 DIY 商店"
 
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2648
 msgid "Stationery"
 msgstr "文具類"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2649
 msgid "Edit Stationery Shop"
 msgstr "編輯文具店"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2654
 msgid "Hairdresser"
 msgstr "美髮類"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2655
 msgid "Edit Hairdresser"
 msgstr "編輯美髮店"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2660
 msgid "Shoes"
 msgstr "鞋類"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2661
 msgid "Edit Shoe Shop"
 msgstr "編輯鞋店"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2666
 msgid "Toys"
 msgstr "玩具類"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2667
 msgid "Edit Toy Shop"
 msgstr "編輯玩具店"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2672
 msgid "Video"
 msgstr "影片類"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2673
 msgid "Edit Video Shop"
 msgstr "編輯影片類商店"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2678
 msgid "Dry Cleaning"
 msgstr "乾洗類"
@@ -21245,9 +21576,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2680
 msgid "Edit Dry Cleaning"
 msgstr "編輯乾洗店"
 
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2685
 msgid "Laundry"
 msgstr "洗衣店"
@@ -21255,9 +21586,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2687
 msgid "Edit Laundry"
 msgstr "編輯洗衣店"
 
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2692
 msgid "Outdoor"
 msgstr "戶外用品"
@@ -21265,28 +21596,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2694
 msgid "Edit Outdoor Shop"
 msgstr "編輯戶外用品店"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2700
 msgid "Edit Sports Shop"
 msgstr "編輯運動用品店"
 
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2705
 msgid "Optician"
 msgstr "眼鏡類"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2706
 msgid "Edit Optician"
 msgstr "編輯眼鏡行"
 
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2713
 msgid "Cash"
 msgstr "現金"
 
 #. group "Cash"
-#: build/trans_presets.java:2708
+#: build/trans_presets.java:2714
 msgid "Bank"
 msgstr "銀行"
@@ -21294,14 +21625,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
 msgid "Edit Bank"
 msgstr "編輯銀行"
 
-#: build/trans_presets.java:2715 build/trans_presets.java:2724
+#: build/trans_presets.java:2721 build/trans_presets.java:2730
 msgid "Automated Teller Machine"
 msgstr "自動提款機(ATM)"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2717
+#: build/trans_presets.java:2723
 msgid "Money Exchange"
 msgstr ""
@@ -21309,5 +21640,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2725
 msgid "Edit Money Exchange"
 msgstr ""
@@ -21315,15 +21646,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2732
 msgid "Edit Automated Teller Machine"
 msgstr "編輯自動提款機"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2737
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2738
 msgid "Doctors"
 msgstr "醫師"
@@ -21331,18 +21662,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2740
 msgid "Edit Doctors"
 msgstr "編輯醫師"
 
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2745
 msgid "Dentist"
 msgstr "牙醫"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2746
 msgid "Edit Dentist"
 msgstr "編輯牙醫"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2751
 msgid "Pharmacy"
 msgstr "藥局"
@@ -21350,5 +21681,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2753
 msgid "Edit Pharmacy"
 msgstr "編輯藥局"
@@ -21356,9 +21687,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2755
 msgid "Dispensing"
 msgstr "配藥"
 
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2759
 msgid "Hospital"
 msgstr "醫院"
@@ -21366,10 +21697,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2761
 msgid "Edit Hospital"
 msgstr "編輯醫院"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2765
 msgid "Emergency Access Point"
 msgstr ""
@@ -21378,5 +21709,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2762
+#: build/trans_presets.java:2768
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -21385,20 +21716,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2771
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2772
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2768
+#: build/trans_presets.java:2774
 msgid "Phone Number"
 msgstr "電話號碼"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2775
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用國際碼，像是 +12-345-67890)"
@@ -21406,5 +21737,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2778
 msgid "Veterinary"
 msgstr "獸醫"
@@ -21413,59 +21744,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2781
 msgid "Edit Veterinary"
 msgstr "編輯獸醫"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2788
 msgid "Geography"
 msgstr ""
 
+#. group "Geography"
+#: build/trans_presets.java:2789
+msgid "Places"
+msgstr "地名"
+
 #. group "Geography/Places"
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:2790
 msgid "Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2791
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2796
 msgid "Country"
 msgstr ""
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2797
 msgid "Edit Country"
 msgstr ""
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2802
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2803
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2808
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2809
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2814
 msgid "County"
 msgstr "縣"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2815
 msgid "Edit County"
 msgstr "編輯縣"
@@ -21473,15 +21809,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2821
 msgid "City"
 msgstr "市"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2822
 msgid "Edit City"
 msgstr "編輯市"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2827
 msgid "Town"
 msgstr "鄉/鎮"
@@ -21489,10 +21825,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2829
 msgid "Edit Town"
 msgstr "編輯鄉/鎮"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
 msgid "Suburb"
 msgstr "郊區"
@@ -21500,25 +21836,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2836
 msgid "Edit Suburb"
 msgstr "編輯郊區"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2841
 msgid "Village"
 msgstr "村/里"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2842
 msgid "Edit Village"
 msgstr "編輯村/里"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2847
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2848
 msgid "Edit Hamlet"
 msgstr ""
@@ -21526,5 +21862,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2854
 msgid "Locality"
 msgstr ""
@@ -21532,10 +21868,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2856
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2855
+#: build/trans_presets.java:2861
 msgid "Island"
 msgstr "島嶼"
@@ -21543,10 +21879,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2863
 msgid "Edit Island"
 msgstr "編輯島嶼"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2868
 msgid "Islet"
 msgstr ""
@@ -21554,5 +21890,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2870
 msgid "Edit Islet"
 msgstr ""
@@ -21560,5 +21896,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2876
 msgid "Cave Entrance"
 msgstr "洞窟入口"
@@ -21566,10 +21902,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:2878
 msgid "Edit Cave Entrance"
 msgstr "編輯洞窟入口"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2882
 msgid "Peak"
 msgstr "峰"
@@ -21577,10 +21913,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2884
 msgid "Edit Peak"
 msgstr "編輯山峰"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2889
 msgid "Glacier"
 msgstr "冰河"
@@ -21588,10 +21924,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:2891
 msgid "Edit Glacier"
 msgstr "編輯冰河"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:2896
 msgid "Volcano"
 msgstr "火山"
@@ -21599,70 +21935,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:2898
 msgid "Edit Volcano"
 msgstr "編輯火山"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2904
 msgid "Boundaries"
 msgstr "邊界"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2899
+#: build/trans_presets.java:2905
 msgid "National"
 msgstr "國界"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2900
+#: build/trans_presets.java:2906
 msgid "Edit National Boundary"
 msgstr "編輯國界"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2911
 msgid "Administrative"
 msgstr "行政區"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2912
 msgid "Edit Administrative Boundary"
 msgstr "編輯行政區邊界"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2917
 msgid "Civil"
 msgstr "城市的"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2918
 msgid "Edit Civil Boundary"
 msgstr "編輯城市邊界"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2923
 msgid "Political"
 msgstr "政治的"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2924
 msgid "Edit Political Boundary"
 msgstr "編輯政治的邊界"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2929
 msgid "National park"
 msgstr "國家公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2930
 msgid "Edit National Park Boundary"
 msgstr "編輯國家公園"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2936
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2937
 msgid "Tree"
 msgstr "樹"
@@ -21671,15 +22007,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2940
 msgid "Edit Tree"
 msgstr "編輯樹"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2945
 msgid "Botanical Name"
 msgstr "植物學名"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2947
 msgid "Wood"
 msgstr ""
@@ -21688,5 +22024,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2950
 msgid "Edit Wood"
 msgstr ""
@@ -21694,17 +22030,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "coniferous"
 msgstr "松類"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "deciduous"
 msgstr "落葉類"
 
-#: build/trans_presets.java:2947 build/trans_presets.java:2956
+#: build/trans_presets.java:2953 build/trans_presets.java:2962
 msgid "mixed"
 msgstr "混合"
 
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
 msgid "Forest"
 msgstr "森林"
@@ -21713,14 +22049,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2958
 msgid "Edit Forest Landuse"
 msgstr "編輯森林土地利用"
 
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2964
 msgid "Nature Reserve"
 msgstr "自然保育"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2965
 msgid "Edit Nature Reserve"
 msgstr "編輯自然保育"
@@ -21728,25 +22064,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2970
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2971
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:2975
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2976
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2974
+#: build/trans_presets.java:2980
 msgid "Fell"
 msgstr ""
@@ -21754,10 +22090,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2982
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2986
 msgid "Heath"
 msgstr ""
@@ -21765,5 +22101,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2988
 msgid "Edit Heath"
 msgstr ""
@@ -21771,5 +22107,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2987
+#: build/trans_presets.java:2993
 msgid "Farmyard"
 msgstr ""
@@ -21778,45 +22114,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2996
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3002
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3007
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3008
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3013
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3014
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3019
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3020
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -21824,25 +22160,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3026
 msgid "Garden"
 msgstr "花園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3027
 msgid "Edit Garden"
 msgstr "編輯花園"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3031
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3032
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3037
 msgid "Village Green"
 msgstr ""
@@ -21850,10 +22186,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3038
+#: build/trans_presets.java:3044
 msgid "Common"
 msgstr ""
@@ -21861,20 +22197,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3040
+#: build/trans_presets.java:3046
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3050
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3055
 msgid "Recreation Ground"
 msgstr ""
@@ -21882,5 +22218,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -21888,15 +22224,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:3064
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3069
 msgid "Graveyard"
 msgstr ""
@@ -21904,9 +22240,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3071
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3077
 msgid "Cemetery"
 msgstr ""
@@ -21914,39 +22250,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3073
+#: build/trans_presets.java:3079
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3080
+#: build/trans_presets.java:3086
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3087
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3092
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3093
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3098
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3099
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3104
 msgid "Railway land"
 msgstr ""
@@ -21954,15 +22290,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3106
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3105
+#: build/trans_presets.java:3111
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3112
 msgid "Edit Military Landuse"
 msgstr ""
@@ -21970,55 +22306,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3118
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3113
+#: build/trans_presets.java:3119
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3125
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3131
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3136
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3137
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3142
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3152
 msgid "Multipolygon"
 msgstr ""
@@ -22028,5 +22364,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
 msgid "Edit Multipolygon"
 msgstr ""
@@ -22035,10 +22371,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3163
 msgid "inner segment"
 msgstr ""
@@ -22046,5 +22382,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3166
 msgid "Turn restriction"
 msgstr ""
@@ -22053,5 +22389,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3169
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -22059,34 +22395,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3171
 msgid "only_straight_on"
 msgstr ""
@@ -22095,15 +22431,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3170
+#: build/trans_presets.java:3176
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3177
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3178
 msgid "to way"
 msgstr ""
@@ -22111,5 +22447,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3175
+#: build/trans_presets.java:3181
 msgid "Route"
 msgstr ""
@@ -22118,5 +22454,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3184
 msgid "Edit Route"
 msgstr ""
@@ -22124,5 +22460,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "Route type"
 msgstr ""
@@ -22194,5 +22530,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3180 build/trans_style.java:233
+#: build/trans_presets.java:3186 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -22201,17 +22537,17 @@
 msgstr "單車"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "bus"
 msgstr "公車"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "road"
 msgstr "道路"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ferry"
 msgstr "渡輪"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "ski"
 msgstr ""
@@ -22264,5 +22600,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3180 build/trans_style.java:247
+#: build/trans_presets.java:3186 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -22271,13 +22607,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "hiking"
 msgstr "健行"
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3180
+#: build/trans_presets.java:3186
 msgid "detour"
 msgstr ""
@@ -22291,10 +22627,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3180 build/trans_style.java:1206
+#: build/trans_presets.java:3186 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3183
+#: build/trans_presets.java:3189
 msgid "Symbol description"
 msgstr ""
@@ -22302,31 +22638,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3192
 msgid "Network"
 msgstr "網路"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:3194
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3195
 msgid "Color (hex)"
 msgstr ""
@@ -22335,30 +22671,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3198
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:3199
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3200
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3201
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3196
+#: build/trans_presets.java:3202
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3203
 msgid "backward halt point"
 msgstr ""
@@ -22796,11 +23132,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3383 build/trans_style.java:3384
-#: build/trans_style.java:3954 build/trans_style.java:4262
-#: build/trans_style.java:4271 build/trans_style.java:4280
-#: build/trans_style.java:4289 build/trans_style.java:4298
-#: build/trans_style.java:4307 build/trans_style.java:4316
-#: build/trans_style.java:4317 build/trans_style.java:4326
-#: build/trans_style.java:4335
+#: build/trans_style.java:3391 build/trans_style.java:3392
+#: build/trans_style.java:3962 build/trans_style.java:4270
+#: build/trans_style.java:4279 build/trans_style.java:4288
+#: build/trans_style.java:4297 build/trans_style.java:4306
+#: build/trans_style.java:4315 build/trans_style.java:4324
+#: build/trans_style.java:4325 build/trans_style.java:4334
+#: build/trans_style.java:4343
 msgid "deprecated"
 msgstr ""
@@ -24824,5 +25160,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3302
+#: build/trans_style.java:3310
 msgid "light_water"
 msgstr ""
@@ -25494,4 +25830,12 @@
 #.
 #. <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"/>
@@ -25516,5 +25860,5 @@
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
-#: build/trans_style.java:3054
+#: build/trans_style.java:3054 build/trans_style.java:3062
 msgid "historic"
 msgstr ""
@@ -25528,5 +25872,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "quarry"
 msgstr ""
@@ -25540,5 +25884,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3111
 msgid "landfill"
 msgstr ""
@@ -25560,5 +25904,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3111 build/trans_style.java:3119
+#: build/trans_style.java:3119 build/trans_style.java:3127
 msgid "basin"
 msgstr ""
@@ -25572,5 +25916,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3127
+#: build/trans_style.java:3135
 msgid "forest"
 msgstr ""
@@ -25584,5 +25928,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3159
+#: build/trans_style.java:3167
 msgid "farmyard"
 msgstr ""
@@ -25605,5 +25949,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3168 build/trans_style.java:3176
+#: build/trans_style.java:3176 build/trans_style.java:3184
 msgid "retail"
 msgstr ""
@@ -25617,5 +25961,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "industrial"
 msgstr ""
@@ -25629,5 +25973,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "brownfield"
 msgstr ""
@@ -25641,5 +25985,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "greenfield"
 msgstr ""
@@ -25653,5 +25997,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3216
 msgid "railland"
 msgstr ""
@@ -25708,7 +26052,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3225 build/trans_style.java:3260
-#: build/trans_style.java:3268 build/trans_style.java:3276
-#: build/trans_style.java:3284 build/trans_style.java:3292
+#: build/trans_style.java:3233 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3292 build/trans_style.java:3300
 msgid "military"
 msgstr ""
@@ -25722,5 +26066,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3241
 msgid "cemetery"
 msgstr ""
@@ -25733,5 +26077,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3309
+#: build/trans_style.java:3317
 msgid "peak"
 msgstr ""
@@ -25746,5 +26090,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "glacier"
 msgstr ""
@@ -25758,5 +26102,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3334
 msgid "volcano"
 msgstr ""
@@ -25811,8 +26155,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3334 build/trans_style.java:3335
-#: build/trans_style.java:3343 build/trans_style.java:3359
-#: build/trans_style.java:3432 build/trans_style.java:3440
-#: build/trans_style.java:3448
+#: build/trans_style.java:3342 build/trans_style.java:3343
+#: build/trans_style.java:3351 build/trans_style.java:3367
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456
 msgid "natural"
 msgstr ""
@@ -25826,5 +26170,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3351
+#: build/trans_style.java:3359
 msgid "scrub"
 msgstr ""
@@ -25838,5 +26182,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3375
 msgid "heath"
 msgstr ""
@@ -25850,8 +26194,7 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3375
-#, fuzzy
+#: build/trans_style.java:3383
 msgid "woodarea"
-msgstr "區域"
+msgstr ""
 
 #. color water
@@ -25863,5 +26206,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "mud"
 msgstr ""
@@ -25875,5 +26218,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3432
 msgid "beach"
 msgstr ""
@@ -25951,8 +26294,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3464 build/trans_style.java:3472
-#: build/trans_style.java:3480 build/trans_style.java:3488
-#: build/trans_style.java:3496 build/trans_style.java:3504
-#: build/trans_style.java:3512 build/trans_style.java:3520
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3520 build/trans_style.java:3528
 msgid "route"
 msgstr ""
@@ -26000,7 +26343,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3530 build/trans_style.java:3538
-#: build/trans_style.java:3546 build/trans_style.java:3554
-#: build/trans_style.java:3562
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554 build/trans_style.java:3562
+#: build/trans_style.java:3570
 msgid "boundary"
 msgstr ""
@@ -26150,11 +26493,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:4002 build/trans_style.java:4010
-#: build/trans_style.java:4018 build/trans_style.java:4026
-#: build/trans_style.java:4034 build/trans_style.java:4042
-#: build/trans_style.java:4050 build/trans_style.java:4058
-#: build/trans_style.java:4066 build/trans_style.java:4074
-#: build/trans_style.java:4082 build/trans_style.java:4090
-#: build/trans_style.java:4098
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090 build/trans_style.java:4098
+#: build/trans_style.java:4106
 msgid "place"
 msgstr ""
@@ -26202,6 +26545,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4215 build/trans_style.java:4222
-#: build/trans_style.java:4229 build/trans_style.java:4236
+#: build/trans_style.java:4223 build/trans_style.java:4230
+#: build/trans_style.java:4237 build/trans_style.java:4244
 msgid "address"
 msgstr ""
@@ -26509,31 +26852,64 @@
 msgstr ""
 
-#~ msgid "Error while loading page {0}"
-#~ msgstr "載入頁面 {0} 時發生錯誤"
-
-#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "求助頁面遺失。以 <A HREF=\"{0}\">English</A> 建立它。"
+#~ msgid "File could not be found."
+#~ msgstr "找不到檔案"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "請選擇至少一項要下載的工作"
+
+#~ msgid "Upload to OSM API failed"
+#~ msgstr "上傳至 OSM API 失敗"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "衝突的關係"
+
+#~ msgid "Error while parsing"
+#~ msgstr "分析時發生錯誤"
+
+#~ msgid "File not found"
+#~ msgstr "找不到檔案"
+
+#~ msgid "Please enter the desired coordinates first."
+#~ msgstr "請先輸入想要的坐標。"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "先選擇一個書籤。"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "請輸入搜尋字串"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "不能從伺服器讀取位置搜尋結果"
+
+#~ msgid "name"
+#~ msgstr "名稱"
+
+#~ msgid "zoom"
+#~ msgstr "縮放"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "請選擇要複製的列。"
 
 #~ msgid ""
-#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
 #~ msgstr ""
-#~ "求助頁面遺失。以 <A HREF=\"{0}\">English</A> 或 <A HREF=\"{1}\">您的語言</"
-#~ "A>建立它。"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "只能在 JOSM 線上求助中編輯求助頁面"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "使用群組「{1}」的預設組合「{0}」"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "使用預設組合「{0}」"
-
-#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
-#~ msgstr "手動設定藍勃特區（例如用於兩個區域間的位置）"
-
-#~ msgid "Open a layer first (GPX, OSM, cache)"
-#~ msgstr "先開啓圖層　(GPX, OSM, 快取)"
+#~ "(您可以設定這個警告每隔幾天出現，<br>只要設定選項「pluginmanager."
+#~ "warntime」。)"
+
+#~ msgid "Request Update"
+#~ msgstr "要求更新"
+
+#~ msgid "error loading metadata"
+#~ msgstr "載入中繼資料時發生錯誤"
+
+#~ msgid "error requesting update: not zoom-level 12"
+#~ msgstr "要求更新發生錯誤：不縮放-等級 12"
+
+#~ msgid "requested: {0}"
+#~ msgstr "要求的：{0}"
+
+#~ msgid "error requesting update"
+#~ msgstr "要求更新時發生錯誤"
 
 #~ msgid "Combine Anyway"
@@ -26569,4 +26945,10 @@
 #~ msgstr "所有的路徑都是空的"
 
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "只能在 JOSM 線上求助中編輯求助頁面"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "載入頁面 {0} 時發生錯誤"
+
 #~ msgid "History of Element"
 #~ msgstr "元件歷史"
@@ -26674,7 +27056,4 @@
 #~ msgstr "公開"
 
-#~ msgid "Aborting..."
-#~ msgstr "正在中止..."
-
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "不能開啓偏好設定目錄：{0}"
@@ -26691,7 +27070,4 @@
 #~ msgid "Authors: {0}"
 #~ msgstr "作者：{0}"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "重新整理選擇區域清單。"
 
 #~ msgid "Occupied By"
@@ -26798,4 +27174,10 @@
 #~ msgstr "選擇讓您的軌跡在　openstreetmap.org 上公開"
 
+#~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
+#~ msgstr "手動設定藍勃特區（例如用於兩個區域間的位置）"
+
+#~ msgid "Open a layer first (GPX, OSM, cache)"
+#~ msgstr "先開啓圖層　(GPX, OSM, 快取)"
+
 #~ msgid "Import TCX file as GPS track"
 #~ msgstr "將 TCX 檔案匯入為 GPS 軌跡"
@@ -26818,4 +27200,10 @@
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "檢驗目前的選擇區域或整個資料組合。"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "使用群組「{1}」的預設組合「{0}」"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "使用預設組合「{0}」"
 
 #~ msgid "Change the projection to {0} first."
@@ -26895,4 +27283,14 @@
 #~ msgstr "沒有資料"
 
+#~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "求助頁面遺失。以 <A HREF=\"{0}\">English</A> 建立它。"
+
+#~ msgid ""
+#~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "求助頁面遺失。以 <A HREF=\"{0}\">English</A> 或 <A HREF=\"{1}\">您的語言</"
+#~ "A>建立它。"
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "未預期的回傳值。得到 {0}"
